diff --git a/.travis.yml b/.travis.yml
index 73ecf925..dde95b1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,4 @@ script:
 services:
     - redis-server
 after_success:
-    cd solar/solar && coveralls
+    cd solar && coveralls
diff --git a/run_tests.sh b/run_tests.sh
index f5b7af01..a2769b9b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -31,6 +31,6 @@ fi
 
 pip install -r solar/test-requirements.txt --download-cache=/tmp/$JOB_NAME
 
-pushd solar/solar
+pushd solar
 
-PYTHONPATH=$WORKSPACE/solar CONFIG_FILE=$CONFIG_FILE py.test --cov=solar -s test/
+PYTHONPATH=$WORKSPACE/solar CONFIG_FILE=$CONFIG_FILE py.test --cov=solar -s solar