diff --git a/ci-build.sh b/ci-build.sh
index 8f71b5d..148d474 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -6,8 +6,6 @@ mkdir -p $BUILD
 
 pep8 --ignore E501 i3pystatus tests
 
-PYTHONPATH=. py.test --junitxml ${BUILD}/testlog.xml tests
-
 # Check that the setup.py script works
 rm -rf ${BUILD}/test-install ${BUILD}/test-install-bin
 mkdir ${BUILD}/test-install ${BUILD}/test-install-bin
@@ -15,6 +13,8 @@ PYTHONPATH=${BUILD}/test-install python setup.py --quiet install --install-lib $
 
 test -f ${BUILD}/test-install-bin/i3pystatus
 
+PYTHONPATH=${BUILD}/test-install py.test --junitxml ${BUILD}/testlog.xml tests
+
 # Check that the docs build w/o warnings (-W flag)
 sphinx-build -b html -W docs ${BUILD}/docs/
 
diff --git a/setup.py b/setup.py
index 5f0dc41..9eb2886 100755
--- a/setup.py
+++ b/setup.py
@@ -26,4 +26,5 @@ setup(name="i3pystatus",
               "i3pystatus = i3pystatus:main"
           ]
       },
+      zip_safe=True,
       )