diff --git a/.gitignore b/.gitignore
index 088d077e..123590ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/build
 /shims
 /version
 /versions
diff --git a/.travis.yml b/.travis.yml
index fdb3e762..5b422439 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 install: git clone https://github.com/sstephenson/bats.git
-script: PATH="./bats/bin:$PATH" test/run && ( cd plugins/python-build bats ${CI:+--tap} test )
+script: make test
 language: c
 env:
   - PYENV_NATIVE_EXT=
diff --git a/Makefile b/Makefile
index ef8946e6..8bc472eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-test: build/bats/bin/bats
-	build/bats/bin/bats --tap test
-	cd plugins/python-build && $(PWD)/build/bats/bin/bats --tap test
-
-build/bats/bin/bats:
-	git clone https://github.com/sstephenson/bats.git build/bats
-
 .PHONY: test
+
+test: bats
+	PATH="./bats/bin:$$PATH" test/run
+	cd plugins/python-build && $(PWD)/bats/bin/bats $${CI:+--tap} test
+
+bats:
+	git clone https://github.com/sstephenson/bats.git