diff --git a/.travis.yml b/.travis.yml
index 980b46cf2..4382e5514 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ branches:
     - v0.x
     - v1.x
     # having another branch lets us force-push tests here without spamming master
-    - travis-test
+    - ci-test
 
 env:
   global:
diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml
index f0a169e15..3deac44b6 100644
--- a/scripts/appveyor.yml
+++ b/scripts/appveyor.yml
@@ -4,6 +4,7 @@ branches:
   only:
   - v0.x
   - v1.x
+  - ci-test
 
 image: Visual Studio 2015
 
@@ -73,3 +74,9 @@ build_script:
     sh -c ./scripts/hash_version.sh
 
     msbuild renderdoc.sln /v:m "/p:Configuration=$env:CONFIGURATION" "/p:Platform=$env:PLATFORM" /p:PlatformToolset=v140
+
+test_script:
+- ps: $env:testexe = "$env:PLATFORM\$env:CONFIGURATION\renderdoccmd.exe"
+- ps: if ( $env:PLATFORM -eq "x86" ) { $env:testexe = "Win32\$env:CONFIGURATION\renderdoccmd.exe" }
+- cmd: >-
+    "%testexe%" test -t unit
diff --git a/scripts/travis/linux_compile.sh b/scripts/travis/linux_compile.sh
index 9fd9ed01b..fe09e5293 100644
--- a/scripts/travis/linux_compile.sh
+++ b/scripts/travis/linux_compile.sh
@@ -21,3 +21,7 @@ else
 	cmake -DCMAKE_BUILD_TYPE=Debug ..
 fi
 make -j2
+
+echo "--- Running unit tests ---"
+
+./bin/renderdoccmd test -t unit