diff --git a/.travis.yml b/.travis.yml
index 232e9775..96a9e362 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,10 @@ cache:
 install:
     - pip install pip-accel
     - pip-accel install coveralls
-    - pip-accel install -r solar/test-requirements.txt
+    - pip-accel install -r test-requirements.txt
 script:
-    - cd solar && py.test --cov=solar -s solar && cd ..
+    - py.test --cov=solar -s solar && cd ..
 services:
     - riak
 after_success:
-    cd solar && coveralls
+    cd && coveralls
diff --git a/bootstrap/playbooks/solar.yaml b/bootstrap/playbooks/solar.yaml
index b6011170..11480ba4 100644
--- a/bootstrap/playbooks/solar.yaml
+++ b/bootstrap/playbooks/solar.yaml
@@ -4,7 +4,9 @@
   sudo: yes
   tasks:
     # Setup development env for solar
-    - shell: pip install -e . chdir=/vagrant/solar
+    - apt: name=libssl-dev state=present
+    - apt: name=libffi-dev state=present
+    - shell: pip install -e . chdir=/vagrant
     - shell: pip install -e . chdir=/vagrant/solard
 
 - hosts: all
diff --git a/run_tests.sh b/run_tests.sh
index d12ede1d..a1ee60f2 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -30,8 +30,7 @@ fi
 . $VENV/bin/activate
 
 pip install pip-accel
-pip-accel install -r solar/test-requirements.txt
+pip-accel install -r test-requirements.txt
 
-pushd solar
 
-SOLAR_CONFIG=../.config PYTHONPATH=$WORKSPACE/solar CONFIG_FILE=$CONFIG_FILE py.test --cov=solar -s solar/test
+SOLAR_CONFIG=../.config CONFIG_FILE=$CONFIG_FILE py.test --cov=solar -s solar/test