diff --git a/bin/ch/stdafx.h b/bin/ch/stdafx.h
index 45f6cd6e2cc..8e2984708b2 100644
--- a/bin/ch/stdafx.h
+++ b/bin/ch/stdafx.h
@@ -23,7 +23,6 @@
 
 #define WIN32_LEAN_AND_MEAN 1
 
-#define ENABLE_TEST_HOOKS 1
 #include "CommonDefines.h"
 #include <map>
 #include <string>
@@ -137,6 +136,9 @@ do { \
     } \
 } while (0)
 
+#ifndef ENABLE_TEST_HOOKS
+#define ENABLE_TEST_HOOKS
+#endif
 #include "TestHooks.h"
 #include "ChakraRtInterface.h"
 #include "HostConfigFlags.h"
diff --git a/lib/Common/CommonDefines.h b/lib/Common/CommonDefines.h
index 8bdb93f79ae..727525f2ae4 100644
--- a/lib/Common/CommonDefines.h
+++ b/lib/Common/CommonDefines.h
@@ -27,7 +27,6 @@
 #ifdef ENABLE_TEST_HOOKS
 #ifndef ENABLE_DEBUG_CONFIG_OPTIONS
 #define ENABLE_DEBUG_CONFIG_OPTIONS 1
-#define DEBUG_CONFIG_OPTIONS_WERE_DISABLED
 #endif
 #endif
 
@@ -313,10 +312,9 @@
 #define ENABLE_TEST_HOOKS
 #endif
 
-#if !defined(DEBUG_CONFIG_OPTIONS_WERE_DISABLED) || defined(DEBUG)
+////////
 //Time Travel flags
 #define ENABLE_TTD 1
-#endif
 
 #if ENABLE_TTD
 //Enable debugging specific aspects of TTD