diff --git a/.travis.yml b/.travis.yml
index 28f0564c..a28da0dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: bionic
 sudo: false
 language: c
 os:
@@ -7,6 +7,7 @@ addons:
   apt:
     packages:
       - shellcheck
+      - cmake
 install:
   - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio ../hardware/keyboardio
 ## We delete the Bundle's version of Kaleidoscope, and symlink ourselves in.
@@ -14,6 +15,11 @@ install:
   - rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope
   - ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope
 script:
+  - unset CC
+  - make travis-install-arduino BOARD_HARDWARE_PATH=$(pwd)/../hardware
+  - (cd ../hardware/keyboardio && make prepare-virtual)
+  - make -C tests all BOARD_HARDWARE_PATH=$(pwd)/../hardware ARDUINO_PATH="$(pwd)/arduino-1.8.13"
+  - rm -rf .kaleidoscope-build-cache
   - make travis-test KALEIDOSCOPE_TEMP_PATH=$(pwd)/.kaleidoscope-build-cache BOARD_HARDWARE_PATH=$(pwd)/../hardware
 notifications:
   email:
diff --git a/testing/makefiles/libcommon.mk b/testing/makefiles/libcommon.mk
index a958280b..65e5c43b 100644
--- a/testing/makefiles/libcommon.mk
+++ b/testing/makefiles/libcommon.mk
@@ -28,6 +28,7 @@ ${OBJ_DIR}/%.o: ${top_dir}/testing/%.cpp ${H_FILES}
 	@echo "compile $@"
 	@install -d "${OBJ_DIR}"
 	g++ -o "$@" -c \
+	  -std=c++14 \
 		-I${top_dir} \
 		-I${top_dir}/src \
 		-I${bundle_path}/../../virtual/cores/arduino \
diff --git a/testing/makefiles/testcase.mk b/testing/makefiles/testcase.mk
index b2d9384c..7354db1e 100644
--- a/testing/makefiles/testcase.mk
+++ b/testing/makefiles/testcase.mk
@@ -55,6 +55,7 @@ ${OBJ_DIR}/%.o: ${SRC_DIR}/%.cpp
 	@echo "compile $@"
 	install -d "${OBJ_DIR}"
 	g++ -o "$@" -c \
+	  -std=c++14 \
 		-I${top_dir} \
 		-I${top_dir}/src \
 		-I${bundle_path}/../../virtual/cores/arduino \