diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -14,5 +14,8 @@
 	runhaskell Setup haddock
 	runhaskell Setup test --show-details=streaming
 
-update-test:
+update-test:	test-module.list
 	doctest-extract-0.1 -i src/ -o src/ --module-prefix DocTest --executable-main=Test.hs --import-tested $$(cat test-module.list)
+
+test-module.list:	utility-ht.cabal
+	grep '^ \+DocTest\.' $< | cut -d. -f2- >$@
diff --git a/src/Test.hs b/src/Test.hs
--- a/src/Test.hs
+++ b/src/Test.hs
@@ -1,14 +1,14 @@
 -- Do not edit! Automatically created with doctest-extract.
 module Main where
 
-import qualified DocTest.Data.List.Reverse.StrictSpine
 import qualified DocTest.Data.List.Reverse.StrictElement
+import qualified DocTest.Data.List.Reverse.StrictSpine
 import qualified DocTest.Data.List.Reverse.Private
 import qualified DocTest.Data.List.Match.Private
 import qualified DocTest.Data.List.HT.Private
+import qualified DocTest.Data.Monoid.HT
 import qualified DocTest.Data.Maybe.HT
 import qualified DocTest.Data.Bool.HT.Private
-import qualified DocTest.Data.Monoid.HT
 import qualified DocTest.Data.Function.HT.Private
 import qualified DocTest.Data.Ix.Enum
 
@@ -16,13 +16,13 @@
 
 main :: IO ()
 main = DocTest.run $ do
-    DocTest.Data.List.Reverse.StrictSpine.test
     DocTest.Data.List.Reverse.StrictElement.test
+    DocTest.Data.List.Reverse.StrictSpine.test
     DocTest.Data.List.Reverse.Private.test
     DocTest.Data.List.Match.Private.test
     DocTest.Data.List.HT.Private.test
+    DocTest.Data.Monoid.HT.test
     DocTest.Data.Maybe.HT.test
     DocTest.Data.Bool.HT.Private.test
-    DocTest.Data.Monoid.HT.test
     DocTest.Data.Function.HT.Private.test
     DocTest.Data.Ix.Enum.test
diff --git a/test-module.list b/test-module.list
deleted file mode 100644
--- a/test-module.list
+++ /dev/null
@@ -1,10 +0,0 @@
-Data.List.Reverse.StrictSpine
-Data.List.Reverse.StrictElement
-Data.List.Reverse.Private
-Data.List.Match.Private
-Data.List.HT.Private
-Data.Maybe.HT
-Data.Bool.HT.Private
-Data.Monoid.HT
-Data.Function.HT.Private
-Data.Ix.Enum
diff --git a/utility-ht.cabal b/utility-ht.cabal
--- a/utility-ht.cabal
+++ b/utility-ht.cabal
@@ -1,6 +1,6 @@
 Cabal-Version:    2.2
 Name:             utility-ht
-Version:          0.0.17.1
+Version:          0.0.17.2
 License:          BSD-3-Clause
 License-File:     LICENSE
 Author:           Henning Thielemann <haskell@henning-thielemann.de>
@@ -30,7 +30,6 @@
 
 Extra-Source-Files:
   Makefile
-  test-module.list
 
 Source-Repository head
   type:     darcs
@@ -39,7 +38,7 @@
 Source-Repository this
   type:     darcs
   location: http://code.haskell.org/~thielema/utility/
-  tag:      0.0.17.1
+  tag:      0.0.17.2
 
 Library
   Build-Depends: