diff --git a/.gitignore b/.gitignore
index 473e677..1336701 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@ AUTHORS
 
 # Do not track Pipfile.lock
 Pipfile.lock
+.pytest_cache/
diff --git a/.travis.yml b/.travis.yml
index f2165c6..77d960f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@
 
 language: python
 
-
 python:
   - 3.6
   - 3.5
@@ -11,8 +10,8 @@ python:
   - 2.7
 
 install:
-  - pip install -U pip pipenv
-  - make dev
+  - make ensure-pip-ci
+  - make dev-ci
 
 script:
   - make check
diff --git a/Makefile b/Makefile
index 64a4786..d66bacb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,26 @@
 
 MODULE:=pipenv_to_requirements
 
-all: dev style checks dists test
+all: ensure-pip dev style checks dists test
+
+ensure-pip:
+	pip install --user --upgrade pipenv pip
+	pip --version
+	pipenv --version
+
+ensure-pip-ci:
+	pip install --upgrade pipenv pip
+	pip --version
+	pipenv --version
 
 dev:
 	pipenv install --dev
 	pipenv run pip install -e .
 
+dev-ci:
+	pipenv install --dev --skip-lock
+	pipenv run pip install -e .
+
 dev-py2:
 	pipenv install --dev --two
 	pipenv run pip install -e .