diff --git a/Makefile.am b/Makefile.am
index 120a06859e1c00b988626fc7fb6cfa28e850c626..0b74f95df3348749d10eb8b5bc38ab8d4c7aa93b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -373,8 +373,8 @@ HPCEXCL = --exclude Main \
 	--exclude Ganeti.Constants \
 	--exclude Ganeti.THH \
 	--exclude Ganeti.HTools.QC \
-	--exclude Ganeti.HTools.QCHelper \
-	--exclude Ganeti.HTools.Version
+	--exclude Ganeti.HTools.Version \
+	--exclude Test.Ganeti.TestHelper
 
 HS_LIB_SRCS = \
 	htools/Ganeti/HTools/CLI.hs \
@@ -391,7 +391,6 @@ HS_LIB_SRCS = \
 	htools/Ganeti/HTools/Node.hs \
 	htools/Ganeti/HTools/PeerMap.hs \
 	htools/Ganeti/HTools/QC.hs \
-	htools/Ganeti/HTools/QCHelper.hs \
 	htools/Ganeti/HTools/Rapi.hs \
 	htools/Ganeti/HTools/Simu.hs \
 	htools/Ganeti/HTools/Text.hs \
@@ -426,7 +425,9 @@ HS_LIB_SRCS = \
 	htools/Ganeti/Rpc.hs \
 	htools/Ganeti/Runtime.hs \
 	htools/Ganeti/Ssconf.hs \
-	htools/Ganeti/THH.hs
+	htools/Ganeti/THH.hs \
+	htest/Test/Ganeti/TestHelper.hs
+
 
 HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
 HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
diff --git a/htools/Ganeti/HTools/QCHelper.hs b/htest/Test/Ganeti/TestHelper.hs
similarity index 97%
rename from htools/Ganeti/HTools/QCHelper.hs
rename to htest/Test/Ganeti/TestHelper.hs
index b853b289db730c18060fa22822bcc45da66d0892..ad0aaa2d2125422804263cdea64292440b01c3be 100644
--- a/htools/Ganeti/HTools/QCHelper.hs
+++ b/htest/Test/Ganeti/TestHelper.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 
-{-| Unittest helpers for ganeti-htools
+{-| Unittest helpers for Haskell components
 
 -}
 
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 -}
 
-module Ganeti.HTools.QCHelper
+module Test.Ganeti.TestHelper
   ( testSuite
   ) where
 
diff --git a/htools/Ganeti/HTools/QC.hs b/htools/Ganeti/HTools/QC.hs
index 2654d4e7d6c11bbf51de8c34177dfdcb58545350..729fc4f5d5f58f878558840741b7eda67ac82656 100644
--- a/htools/Ganeti/HTools/QC.hs
+++ b/htools/Ganeti/HTools/QC.hs
@@ -118,7 +118,7 @@ import qualified Ganeti.HTools.Program.Hbal
 import qualified Ganeti.HTools.Program.Hscan
 import qualified Ganeti.HTools.Program.Hspace
 
-import Ganeti.HTools.QCHelper (testSuite)
+import Test.Ganeti.TestHelper (testSuite)
 
 -- * Constants