diff --git a/.travis.yml b/.travis.yml
index a34e0e29f9c..cc507814c92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,12 @@ env:
     - BYOND_MINOR="1346"
     - NODE_VERSION="4"
     - BUILD_TOOLS=false
-    - DM_MAPFILE=""
+    - BUILD_TESTING=false
+    - DM_MAPFILE="loadallmaps"
     matrix:
     - BUILD_TOOLS=true
-    - DM_MAPFILE="loadallmaps"
+    - BUILD_TESTING=true
+    - BUILD_TESTING=false
 
 cache:
   directories:
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 1c4bc7a574f..b2c11e96c41 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -50,6 +50,10 @@
 #warn compiling in TESTING mode. testing() debug messages will be visible.
 #endif
 
+#ifdef TRAVISTESTING
+#define TESTING
+#endif
+
 //Update this whenever you need to take advantage of more recent byond features
 #define MIN_COMPILER_VERSION 510
 #if DM_VERSION < MIN_COMPILER_VERSION
diff --git a/tools/travis/build_byond.sh b/tools/travis/build_byond.sh
index e5f35adfaa2..ac50562db76 100755
--- a/tools/travis/build_byond.sh
+++ b/tools/travis/build_byond.sh
@@ -7,5 +7,9 @@ shopt -s globstar
 if [ "$BUILD_TOOLS" = false ]; then
     (! grep 'step_[xy]' _maps/**/*.dmm)
     source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
-    tools/travis/dm.sh -DTRAVISBUILDING -M${DM_MAPFILE} tgstation.dme
+	if [ "$BUILD_TESTING" = true ]; then
+		tools/travis/dm.sh -DTRAVISBUILDING -M${DM_MAPFILE} tgstation.dme
+	else
+		tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -Mruntimestation tgstation.dme
+	fi;
 fi;