Fix tests broken after --noqmtest option was removed from runtest.py

2 files changed, 3 insertions, 3 deletions

diff --git a/bin/calibrate.py b/bin/calibrate.py
index 72a6ac798..8ed2eceab 100644
--- a/bin/calibrate.py
+++ b/bin/calibrate.py
@@ -50,7 +50,7 @@ def main(argv=None):
         if len(args) > 1:
             print arg + ':'
 
-        command = [sys.executable, 'runtest.py', '--noqmtest']
+        command = [sys.executable, 'runtest.py']
         if opts.package:
             command.extend(['-p', opts.package])
         command.append(arg)
diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py
index eb332234a..cea2f116c 100644
--- a/test/runtest/noqmtest.py
+++ b/test/runtest/noqmtest.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
-Test that the --noqmtest option invokes tests directly via Python, not
+Test that by default tests are invoked directly via Python, not
 using qmtest.
 """
 
@@ -74,7 +74,7 @@ testlist = [
     test_pass_py,
 ]
 
-test.run(arguments = '-k --noqmtest %s' % ' '.join(testlist),
+test.run(arguments = '-k %s' % ' '.join(testlist),
          status = 1,
          stdout = expect_stdout,
          stderr = expect_stderr)