diff --git a/main.yml b/main.yml
index eedf726c..1024df83 100644
--- a/main.yml
+++ b/main.yml
@@ -22,13 +22,9 @@
     - shell: pip install python-keystoneclient==1.5.0
 
     - shell: pip install httpie
-
-    # requirements
-    - shell: pip install -r /vagrant/requirements.txt
-
     # Graph drawing
     #- apt: name=python-matplotlib state=present
     - apt: name=python-pygraphviz state=present
 
       # Setup development env for solar
-    #- shell: python setup.py develop chdir=/vagrant/solar
+    - shell: python setup.py develop chdir=/vagrant/solar
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 2a39176f..00000000
--- a/requirements.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-click==4.0
-jinja2==2.7.3
-networkx==1.9.1
-PyYAML==3.11
-jsonschema==2.4.0
-requests==2.7.0
-mock
-dictdiffer==0.4.0
-enum34==1.0.4
-redis==2.10.3
diff --git a/run_tests.sh b/run_tests.sh
index 4f2760a1..531344d0 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -16,7 +16,7 @@ fi
 
 . $VENV/bin/activate
 
-pip install -r requirements.txt --download-cache=/tmp/$JOB_NAME
+pip install -r solar/requirements.txt --download-cache=/tmp/$JOB_NAME
 
 pushd solar/solar
 
diff --git a/solar/requirements.txt b/solar/requirements.txt
index 32d6395a..670b4eaf 100644
--- a/solar/requirements.txt
+++ b/solar/requirements.txt
@@ -1,7 +1,12 @@
 six>=1.9.0
-pyyaml
-jinja2
-networkx
-mock
 ply
+click==4.0
+jinja2==2.7.3
+networkx==1.9.1
+PyYAML==3.11
 jsonschema==2.4.0
+requests==2.7.0
+mock
+dictdiffer==0.4.0
+enum34==1.0.4
+redis==2.10.3