diff --git a/.travis.yml b/.travis.yml
index f4a62b01..5d31d23f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,4 +27,4 @@ install:
   - travis_retry $TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 make setup
 
 script:
-  - $TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 make test
+  - $TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 make ci
diff --git a/Makefile b/Makefile
index 2c186e46..00693a5c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,14 @@
 NPM_PREFIX=$(realpath node_modules)
 PATH:=${NPM_PREFIX}/.bin:${PATH}
 
-default: test format diff styleguide-app/elm.js
-
-.PHONY: diff
-diff: node_modules
-	elm-package diff
-
 .PHONY: test
 test: elm-stuff tests/elm-stuff node_modules
 	elm-test
 
+.PHONY: diff
+diff: node_modules
+	elm-package diff
+
 .PHONY: format
 format: node_modules
 	elm-format --validate src tests styleguide-app
@@ -24,8 +22,6 @@ styleguide-app/elm.js: styleguide-app/elm-stuff styleguide-app/**/*.elm
 
 # plumbing
 
-.PHONY: setup
-setup: node_modules elm-stuff tests/elm-stuff styleguide-app/elm-stuff
 
 node_modules: package.json
 	npm install
@@ -40,3 +36,11 @@ elm-stuff: elm-package.json node_modules
 %/elm-stuff: %/elm-package.json node_modules
 	cd $(@D); elm-package install --yes
 	touch -m $@
+
+# special targets for travis, but anyone can use them, really.
+
+.PHONY: setup
+setup: node_modules elm-stuff tests/elm-stuff styleguide-app/elm-stuff
+
+.PHONY: ci
+ci: test format diff styleguide-app/elm.js