diff --git a/tests/apollo/CMakeLists.txt b/tests/apollo/CMakeLists.txt
index 0003812600..dbcee91633 100644
--- a/tests/apollo/CMakeLists.txt
+++ b/tests/apollo/CMakeLists.txt
@@ -67,7 +67,7 @@ endif()
 # apollo_test(NAME skvbc_preexecution_with_result_auth_tests SUITE test_skvbc_preexecution VARS PRE_EXEC_RESULT_AUTH_ENABLED=True)
 
 function(apollo_test)
-    set(options V4 SUDO)
+    set(options V4 SUDO NIGHTLY)
     set(oneValueArgs NAME SUITE)
     set(multiValueArgs VARS)
     cmake_parse_arguments(APOLLO_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -90,7 +90,9 @@ function(apollo_test)
 			 COMMAND ${DO_SUDO} sh -c
         	 "env ${APOLLO_ENV} ${ADDITIONAL_ENV_VARS} BLOCK_CHAIN_VERSION=${BLOCKCHAIN_VERSION} TEST_NAME=${APOLLO_TEST_NAME} python3 -m unittest ${APOLLO_TEST_SUITE} ${TEST_OUTPUT}"
         	)
-  set_tests_properties(${APOLLO_TEST_NAME} PROPERTIES TIMEOUT ${APOLLO_TEST_TIMEOUT}) 
+  if(NOT APOLLO_TEST_NIGHTLY)
+    set_tests_properties(${APOLLO_TEST_NAME} PROPERTIES TIMEOUT ${APOLLO_TEST_TIMEOUT}) 
+  endif()
 endfunction()
 	
 apollo_test(NAME skvbc_basic_tests SUITE test_skvbc)
@@ -145,5 +147,5 @@ apollo_test(NAME skvbc_reply_tests SUITE test_skvbc_reply)
 apollo_test(NAME skvbc_diagnostics_tests SUITE test_skvbc_diagnostics)
 apollo_test(NAME osexample_demo_tests SUITE test_osexample_demo)
 if(ENABLE_RESTART_RECOVERY_TESTS)
-	apollo_test(NAME skvbc_restart_recovery_tests SUITE test_skvbc_restart_recovery)
+	apollo_test(NAME skvbc_restart_recovery_tests SUITE test_skvbc_restart_recovery NIGHTLY)
 endif()