diff --git a/.travis.yml b/.travis.yml
index 1620f2c..36fbc86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,11 @@ install:
 before_script:
   - curl -o /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin && chmod +x /tmp/urchin
 script:
-  - NVM_DIR=$TRAVIS_BUILD_DIR make URCHIN=/tmp/urchin test
-
+  - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin $SHELL
+env:
+  - SHELL=sh TEST_SUITE=fast
+  - SHELL=dash TEST_SUITE=fast
+  - SHELL=bash TEST_SUITE=fast
+  - SHELL=zsh TEST_SUITE=fast
+  - SHELL=ksh TEST_SUITE=fast
+  - SHELL=sh TEST_SUITE=slow
diff --git a/Makefile b/Makefile
index cb14573..67d860b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,14 @@
 URCHIN=`which urchin`
 SHELLS=sh bash dash ksh zsh
+TEST_SUITE=fast
 
 .PHONY: $(SHELLS) test
 
-fast: $(SHELLS)
-
 $(SHELLS):
 	@printf '\n\033[0;34m%s\033[0m\n' "Running tests in $@"
-	@$@ $(URCHIN) -f test/fast
+	@$@ $(URCHIN) -f test/$(TEST_SUITE)
 
-test: fast
+test: $(SHELLS)
 	@$(URCHIN) -f test/slow 
 
 default: test