diff --git a/htest/Test/Ganeti/OpCodes.hs b/htest/Test/Ganeti/OpCodes.hs
index b2f6a74062636acec2e021841ea57dca328583ae..11ab09fa86328827fa1b3d02f14f834dc15972fe 100644
--- a/htest/Test/Ganeti/OpCodes.hs
+++ b/htest/Test/Ganeti/OpCodes.hs
@@ -438,7 +438,7 @@ case_AllDefined = do
 -- be skipped).
 case_py_compat :: HUnit.Assertion
 case_py_compat = do
-  let num_opcodes = length OpCodes.allOpIDs * 500
+  let num_opcodes = length OpCodes.allOpIDs * 100
   sample_opcodes <- sample' (vectorOf num_opcodes
                              (arbitrary::Gen OpCodes.OpCode))
   let opcodes = head sample_opcodes
diff --git a/htest/Test/Ganeti/TestCommon.hs b/htest/Test/Ganeti/TestCommon.hs
index 00743c855d219b7ad9b79c127d7a5aeb6d05f7a9..22f07e8c1aeba5e3624681fff9ff3ef74452cf32 100644
--- a/htest/Test/Ganeti/TestCommon.hs
+++ b/htest/Test/Ganeti/TestCommon.hs
@@ -134,7 +134,7 @@ instance Show DNSChar where
 -- | Generates a single name component.
 genName :: Gen String
 genName = do
-  n <- choose (1, 64)
+  n <- choose (1, 16)
   dn <- vector n
   return (map dnsGetChar dn)