diff --git a/cmake/AddFdbTest.cmake b/cmake/AddFdbTest.cmake
index 556a84cdd5..b3ffb51760 100644
--- a/cmake/AddFdbTest.cmake
+++ b/cmake/AddFdbTest.cmake
@@ -54,7 +54,7 @@ endfunction()
 #   all these tests in serialized order and within the same directory. This is
 #   useful for restart tests
 function(add_fdb_test)
-  set(options UNIT IGNORE RESTORE)
+  set(options UNIT IGNORE)
   set(oneValueArgs TEST_NAME TIMEOUT)
   set(multiValueArgs TEST_FILES)
   cmake_parse_arguments(ADD_FDB_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index c84aa79172..dfaaa02fdd 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -140,7 +140,7 @@ else()
     -Wno-deprecated
     -fvisibility=hidden
     -Wreturn-type
-#    -fdiagnostics-color=always
+    -fdiagnostics-color=always
     -fPIC)
   if (GPERFTOOLS_FOUND AND GCC)
     add_compile_options(
diff --git a/tests/TestRunner/TestRunner.py b/tests/TestRunner/TestRunner.py
index 650609f32c..f0e5741830 100755
--- a/tests/TestRunner/TestRunner.py
+++ b/tests/TestRunner/TestRunner.py
@@ -300,8 +300,6 @@ def run_simulation_test(basedir, options):
             tmp[0] = options.old_binary
         if not first:
             tmp.append('-R')
-            if options.restoring == 'YES':
-                tmp.append('--restoring')
         first = False
         tmp.append('-f')
         tmp.append(testfile)
@@ -370,9 +368,6 @@ if __name__ == '__main__':
                         choices=['xml', 'json'], help='Log format (json or xml)')
     parser.add_argument('-O', '--old-binary', required=False, default=None,
                         help='Path to the old binary to use for upgrade tests')
-    parser.add_argument('-RO', '--restoring', required=False, default='NO',
-                        choices=['YES', 'NO'],
-                        help='Set if you want asnapshot to be restored')
     parser.add_argument('--aggregate-traces', default='NONE',
                         choices=['NONE', 'FAILED', 'ALL'])
     parser.add_argument('--keep-logs', default='FAILED',