diff --git a/src/CTestConfig.cmake b/src/CTestConfig.cmake
index fa3c21d29a..f8aa74b7d4 100644
--- a/src/CTestConfig.cmake
+++ b/src/CTestConfig.cmake
@@ -5,7 +5,7 @@
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
 set(CTEST_PROJECT_NAME "OpenMC")
-set(CTEST_NIGHTLY_START_TIME "05:00:00 UTC")
+set(CTEST_NIGHTLY_START_TIME "03:00:00 UTC")
 
 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "neutronbalance.mit.edu")
diff --git a/tests/run_nightly_tests.py b/tests/run_nightly_tests.py
index ab5d4d586c..8682209924 100755
--- a/tests/run_nightly_tests.py
+++ b/tests/run_nightly_tests.py
@@ -171,6 +171,8 @@ ctest_vars = {
 
 # Begin testing
 call(['rm', '-rf', 'build'])
+call(['rm', '-rf', 'ctestscript.run'])
+call(['./cleanup'])
 for key in iter(tests):
     test = tests[key]
 
@@ -188,3 +190,5 @@ for key in iter(tests):
 
     # Clear build directory
     call(['rm', '-rf', 'build'])
+    call(['rm', '-rf', 'ctestscript.run'])
+    call(['./cleanup'])