diff --git a/Makefile b/Makefile
index fe44e914d..c8d11b407 100644
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,11 @@ build/test/Makefile: src common config.gypi test/test.gyp
 	deps/run_gyp test/test.gyp --depth=. -Goutput_dir=.. --generator-output=./build/test -f make
 
 test: build/test/Makefile
-	$(MAKE) -C build/test BUILDTYPE=Testing V=$(V) test
+	$(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) test
 
 test_%: build/test/Makefile
-	$(MAKE) -C build/test BUILDTYPE=Testing V=$(V) $*
-	(cd build/Testing && exec ./test_$*)
+	$(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) $*
+	(cd build/$(BUILDTYPE) && exec ./test_$*)
 
 # build Mac OS X project for Xcode
 xtest: config.gypi clear_xcode_cache node
diff --git a/common.gypi b/common.gypi
index 513d8688f..5d02a71c1 100644
--- a/common.gypi
+++ b/common.gypi
@@ -34,16 +34,6 @@
           'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES'
         }
       },
-      'Testing': {
-        'cflags_cc': [ '-O3' ],
-        'defines': [ 'NDEBUG', 'TESTING' ],
-        'xcode_settings': {
-          'GCC_OPTIMIZATION_LEVEL': '3',
-          'GCC_GENERATE_DEBUGGING_SYMBOLS': 'NO',
-          'DEAD_CODE_STRIPPING': 'YES',
-          'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES'
-        }
-      }
     }
   }
 }
diff --git a/include/mbgl/platform/event.hpp b/include/mbgl/platform/event.hpp
index 01a23aa25..1676f40d2 100644
--- a/include/mbgl/platform/event.hpp
+++ b/include/mbgl/platform/event.hpp
@@ -10,7 +10,6 @@ namespace mbgl {
 enum class EventSeverity : uint8_t {
     Debug,
     Info,
-    Test,
     Warning,
     Error,
 };
@@ -18,7 +17,6 @@ enum class EventSeverity : uint8_t {
 MBGL_DEFINE_ENUM_CLASS(EventSeverityClass, EventSeverity, {
     { EventSeverity::Debug, "DEBUG" },
     { EventSeverity::Info, "INFO" },
-    { EventSeverity::Test, "TEST" },
     { EventSeverity::Warning, "WARNING" },
     { EventSeverity::Error, "ERROR" },
     { EventSeverity(-1), "UNKNOWN" },
@@ -61,9 +59,6 @@ constexpr EventSeverity disabledEventSeverities[] = {
 #if !DEBUG
     EventSeverity::Debug,
 #endif
-#if !TESTING
-    EventSeverity::Test,
-#endif
 };
 
 
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index 716594824..dd9ee3f26 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-cd build/Testing
+cd build/${BUILDTYPE:-Release}
 
 for TEST in ./test_* ; do
     ${TEST}