diff --git a/Ganeti/HTools/QC.hs b/Ganeti/HTools/QC.hs
index 0085f3cb60e070a3dd924f13bbabc9a6bda4232d..6c7f4ce72ef983f080c7f031c48fc49c17353c57 100644
--- a/Ganeti/HTools/QC.hs
+++ b/Ganeti/HTools/QC.hs
@@ -52,9 +52,9 @@ import qualified Ganeti.HTools.Utils as Utils
 maxMem :: Int
 maxMem = 1024 * 1024
 
--- | Maximum disk (1PiB, somewhat random value)
+-- | Maximum disk (8TiB, somewhat random value)
 maxDsk :: Int
-maxDsk = 1024 * 1024 * 1024
+maxDsk = 1024 * 1024 * 8
 
 -- | Max CPUs (1024, somewhat random value)
 maxCpu :: Int
diff --git a/test.hs b/test.hs
index 421b3005696271f796ce0c04a3cd7dfb54f1a95d..8fffa99ad8828fdeeacd51020987eb04bacfd19e 100644
--- a/test.hs
+++ b/test.hs
@@ -36,7 +36,7 @@ import Ganeti.HTools.QC
 options :: TestOptions
 options = TestOptions
       { no_of_tests         = 500
-      , length_of_tests     = 5
+      , length_of_tests     = 10
       , debug_tests         = False }