diff --git a/.travis.yml b/.travis.yml
index d5c9bbf1b2059591407cfbc8f50728f5faff5c36..b02e7318c1dffad5afd7d4db8561774bad417c31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,6 +85,12 @@ matrix:
         - CONFIG="--disable-user"
 
 
+    # Just build tools and run minimal unit and softfloat checks
+    - env:
+        - BASE_CONFIG="--enable-tools"
+        - CONFIG="--disable-user --disable-system"
+        - TEST_CMD="make check-unit check-softfloat -j3"
+
     - env:
         - CONFIG="--enable-debug --enable-debug-tcg --disable-user"
 
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 75b682cbe87b2bbf54d6eb5cc5cf9790ef53d9a5..852f17b8c79cbc74ed3c12d3b6df0f434d7146ca 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1090,7 +1090,7 @@ clean-tcg-tests-%:
 build-tcg: $(BUILD_TCG_TARGET_RULES)
 
 .PHONY: check-tcg
-check-tcg: check-softfloat $(RUN_TCG_TARGET_RULES)
+check-tcg: $(RUN_TCG_TARGET_RULES)
 
 .PHONY: clean-tcg
 clean-tcg: $(CLEAN_TCG_TARGET_RULES)