diff --git a/system/t02_config/ConfigInFileTest_gold b/system/t02_config/ConfigInFileTest_gold
index 7dd843ce..e366b77e 100644
--- a/system/t02_config/ConfigInFileTest_gold
+++ b/system/t02_config/ConfigInFileTest_gold
@@ -17,11 +17,7 @@ Use "aptly help <command>" for more information about a command.
 Options:
   -architectures="": list of architectures to consider during (comma-separated), default to all available
   -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf)
-  -cpuprofile="": write cpu profile to file
   -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b'
   -dep-follow-recommends=false: when processing dependencies, follow Recommends
   -dep-follow-source=false: when processing dependencies, follow from binary to Source packages
   -dep-follow-suggests=false: when processing dependencies, follow Suggests
-  -meminterval=100ms: memory stats dump interval
-  -memprofile="": write memory profile to this file
-  -memstats="": write memory stats periodically to this file
diff --git a/system/t02_config/__init__.py b/system/t02_config/__init__.py
index 065ec56b..99d29c40 100644
--- a/system/t02_config/__init__.py
+++ b/system/t02_config/__init__.py
@@ -3,6 +3,7 @@ Test config file
 """
 
 import os
+import re
 import inspect
 from lib import BaseTest
 
@@ -43,6 +44,8 @@ class ConfigInFileTest(BaseTest):
     runCmd = ["aptly", "-config=%s" % (os.path.join(os.path.dirname(inspect.getsourcefile(BadConfigTest)), "aptly.conf"), )]
     prepare = BaseTest.prepare_remove_all
 
+    outputMatchPrepare = lambda _, s: re.sub(r'  -(cpuprofile|memprofile|memstats|meminterval)=.*\n', '', s, flags=re.MULTILINE)
+
 
 class ConfigInMissingFileTest(BaseTest):
     """
diff --git a/system/t03_help/MainHelpTest_gold b/system/t03_help/MainHelpTest_gold
index edbe7b31..12772441 100644
--- a/system/t03_help/MainHelpTest_gold
+++ b/system/t03_help/MainHelpTest_gold
@@ -6,12 +6,8 @@ back as Debian repositories.
 Options:
   -architectures="": list of architectures to consider during (comma-separated), default to all available
   -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf)
-  -cpuprofile="": write cpu profile to file
   -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b'
   -dep-follow-recommends=false: when processing dependencies, follow Recommends
   -dep-follow-source=false: when processing dependencies, follow from binary to Source packages
   -dep-follow-suggests=false: when processing dependencies, follow Suggests
-  -meminterval=100ms: memory stats dump interval
-  -memprofile="": write memory profile to this file
-  -memstats="": write memory stats periodically to this file
 
diff --git a/system/t03_help/MainTest_gold b/system/t03_help/MainTest_gold
index 7dd843ce..e366b77e 100644
--- a/system/t03_help/MainTest_gold
+++ b/system/t03_help/MainTest_gold
@@ -17,11 +17,7 @@ Use "aptly help <command>" for more information about a command.
 Options:
   -architectures="": list of architectures to consider during (comma-separated), default to all available
   -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf)
-  -cpuprofile="": write cpu profile to file
   -dep-follow-all-variants=false: when processing dependencies, follow a & b if depdency is 'a|b'
   -dep-follow-recommends=false: when processing dependencies, follow Recommends
   -dep-follow-source=false: when processing dependencies, follow from binary to Source packages
   -dep-follow-suggests=false: when processing dependencies, follow Suggests
-  -meminterval=100ms: memory stats dump interval
-  -memprofile="": write memory profile to this file
-  -memstats="": write memory stats periodically to this file
diff --git a/system/t03_help/__init__.py b/system/t03_help/__init__.py
index 1657b733..37b80f4e 100644
--- a/system/t03_help/__init__.py
+++ b/system/t03_help/__init__.py
@@ -2,6 +2,7 @@
 Test help screens
 """
 
+import re
 from lib import BaseTest
 
 
@@ -11,6 +12,8 @@ class MainTest(BaseTest):
     """
     runCmd = "aptly"
 
+    outputMatchPrepare = lambda _, s: re.sub(r'  -(cpuprofile|memprofile|memstats|meminterval)=.*\n', '', s, flags=re.MULTILINE)
+
 
 class MirrorTest(BaseTest):
     """
@@ -32,6 +35,8 @@ class MainHelpTest(BaseTest):
     """
     runCmd = "aptly help"
 
+    outputMatchPrepare = lambda _, s: re.sub(r'  -(cpuprofile|memprofile|memstats|meminterval)=.*\n', '', s, flags=re.MULTILINE)
+
 
 class MirrorHelpTest(BaseTest):
     """