Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision f6fd22a4915bf2fdaebd748c8352b24981c77724)
+++ tests/Makefile.am	(revision d144c2637d83f22ae526a50bd0bfd7c561f6c92b)
@@ -111,5 +111,5 @@
 # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 all-local : # This name is important to automake and implies the default build target.
-	@+${TEST_PY} --debug=${debug} --install=${installed} --invariant ${ARCHIVE_ERRORS} ${TIMEOUT} ${GLOBAL_TIMEOUT} ${ARCH} --all
+	@+${TEST_PY} --debug=${debug} --install=${installed} ${ARCHIVE_ERRORS} ${TIMEOUT} ${GLOBAL_TIMEOUT} ${ARCH} --all
 
 tests : all-local # synonym
Index: tests/test.py
===================================================================
--- tests/test.py	(revision f6fd22a4915bf2fdaebd748c8352b24981c77724)
+++ tests/test.py	(revision d144c2637d83f22ae526a50bd0bfd7c561f6c92b)
@@ -114,5 +114,5 @@
 	parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=comma_separated(yes_no), default='no')
 	parser.add_argument('--continue', help='When multiple specifications are passed (debug/install/arch), sets whether or not to continue if the last specification failed', type=yes_no, default='yes', dest='continue_')
-	parser.add_argument('--invariant', help='Tell the compiler to check invariants while running.', action='store_true')
+	parser.add_argument('--no-invariant', help='Tell the compiler to not check invariant while running.', action='store_false')
 	parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=180)
 	parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)