diff --git a/apply-merge.cabal b/apply-merge.cabal
index 13033b1..0d15b0d 100644
--- a/apply-merge.cabal
+++ b/apply-merge.cabal
@@ -62,6 +62,9 @@ test-suite apply-merge-tests
       Test.Data.List.ApplyMerge.IntMap
       Test.Data.List.ApplyMerge.IntSet
       Test.Data.PQueue.Prio.Min.Mutable
+      Paths_apply_merge
+  autogen-modules:
+      Paths_apply_merge
   hs-source-dirs:
       src
       test
@@ -91,6 +94,9 @@ benchmark apply-merge-benchmarks
       Bench.Data.DoublyLinkedList.STRef
       Bench.PriorityQueue.MinPQueue
       Bench.PriorityQueue.MinPQueue.Mutable
+      Paths_apply_merge
+  autogen-modules:
+      Paths_apply_merge
   hs-source-dirs:
       src
       bench
diff --git a/package.yaml b/package.yaml
index 9d36408..ee155a6 100644
--- a/package.yaml
+++ b/package.yaml
@@ -59,19 +59,6 @@ tests:
     - src
     - test
     main: Main.hs
-    other-modules:
-    - Data.DoublyLinkedList.STRef
-    - Data.List.ApplyMerge
-    - Data.List.ApplyMerge.DoublyLinkedList
-    - Data.List.ApplyMerge.IntMap
-    - Data.List.ApplyMerge.IntSet
-    - Data.PQueue.Prio.Min.Mutable
-    - Test.Data.DoublyLinkedList.STRef
-    - Test.Data.List.ApplyMerge.Common
-    - Test.Data.List.ApplyMerge.DoublyLinkedList
-    - Test.Data.List.ApplyMerge.IntMap
-    - Test.Data.List.ApplyMerge.IntSet
-    - Test.Data.PQueue.Prio.Min.Mutable
     dependencies:
     - containers ^>= {0.6}
     - pqueue ^>= {1.4, 1.5}
@@ -88,16 +75,6 @@ benchmarks:
     - src
     - bench
     main: Main.hs
-    other-modules:
-    - Data.DoublyLinkedList.STRef
-    - Data.List.ApplyMerge
-    - Data.List.ApplyMerge.DoublyLinkedList
-    - Data.List.ApplyMerge.IntMap
-    - Data.List.ApplyMerge.IntSet
-    - Data.PQueue.Prio.Min.Mutable
-    - Bench.Data.DoublyLinkedList.STRef
-    - Bench.PriorityQueue.MinPQueue
-    - Bench.PriorityQueue.MinPQueue.Mutable
     dependencies:
     - containers ^>= {0.6}
     - pqueue ^>= {1.4, 1.5}