diff --git a/.travis.yml b/.travis.yml
index 2b7a57c3d4..69e103833f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ env:
     - BYOND_MAJOR="511"
     - BYOND_MINOR="1385"
     - DMEName="Tools/DMAPITravisTester.dme"
+    matrix:
+    - BUILD_CLIENT=true
+    - BUILD_CLIENT=false
 
 cache:
   directories:
@@ -16,9 +19,10 @@ addons:
     packages:
       - libc6-i386
       - libstdc++6:i386
+      - nuget
 
 install:
-    - ./Tools/install_byond.sh
+  - if [ "$BUILD_CLIENT" = true ]; then nuget restore else ./Tools/install_byond.sh fi
 
 script:
-    - ./Tools/build_byond.sh
+  - if [ "$BUILD_CLIENT" = true ]; then xbuild /p:Configuration=Release-Client else ./Tools/build_byond.sh fi