diff --git a/.travis.yml b/.travis.yml
index a357be1d762..526ebde75ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,6 @@ sudo: false
 git:
   depth: 1
 
-env:
-  global:
-    - BYOND_MAJOR="511"
-    - BYOND_MINOR="1385"
-    - BYOND_MACRO_COUNT=4
-  matrix:
-    - DM_MAPFILE="cyberiad"
-    - DM_MAPFILE="metastation"
-    - DM_MAPFILE="test_all_maps"
-
 cache:
   directories:
     - $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
@@ -26,39 +16,50 @@ addons:
       - libgcc1:i386
       - libstdc++6:i386
 
+env:
+  global:
+    - BYOND_MAJOR="511"
+    - BYOND_MINOR="1385"
+    - BYOND_MACRO_COUNT=4
+  matrix:
+    - DM_MAPFILE="cyberiad"
+    - DM_MAPFILE="metastation"
+    - DM_MAPFILE="test_all_maps"
+
+stages:
+  - File Checks
+  - test
+
 before_script:
   - chmod +x ./install-byond.sh
   - ./install-byond.sh
 script:
-  - (num=$(grep -Ern '\\(red|blue|green|black|italic|bold|b|i[^mc])' code/ | wc -l); echo "$num BYOND text macros (expecting ${BYOND_MACRO_COUNT} or fewer)"; [ $num -le ${BYOND_MACRO_COUNT} ])
   - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
   - bash dm.sh -M${DM_MAPFILE} paradise.dme
 
-
-# File checks - Rules:
-# - No step_x/step_y in .dmm files
-# - html/changelog/example.yml untouched
-# - Changelog generation works
-matrix:
+jobs:
   include:
-    - env: FILE_CHECKS=1
+    # Basic styling/functionality checks
+    - stage: File Checks
+      env:
       addons:
       install:
         - pip install --user PyYaml -q
         - pip install --user beautifulsoup4 -q
-      before_script:
+      before_script: skip
       script:
         - shopt -s globstar
         - (! grep 'step_[xy]' _maps/map_files/**/*.dmm)
+        - (num=$(grep -Ern '\\(red|blue|green|black|italic|bold|b|i[^mc])' code/ | wc -l); echo "$num BYOND text macros (expecting ${BYOND_MACRO_COUNT} or fewer)"; [ $num -le ${BYOND_MACRO_COUNT} ])
         - md5sum -c - <<< "6dc1b6bf583f3bd4176b6df494caa5f1 *html/changelogs/example.yml"
         - python tools/ss13_genchangelog.py html/changelog.html html/changelogs
 
-# NodeJS Checks
-# - Builds NanoUI
-    - env: NODEJS_CHECKS=1
+    # Compile NanoUI to make sure it works
+    - stage: NanoUI
       language: node_js
       node_js:
         - "9"
+      env:
       addons:
       before_install:
         - npm install -g bower gulp
@@ -68,4 +69,4 @@ matrix:
         - bower install --silent
       before_script:
       script:
-        - gulp --min
\ No newline at end of file
+        - gulp --min