diff --git a/.gitignore b/.gitignore
index c9cc692..ea862c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /build.sh.lviz
 *.pyc
 /build.sh
+/pyenv
diff --git a/Makefile b/Makefile
index 69d9c68..b09aa6a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
-TEST_REQUIREMENTS=nose coverage
+TEST_REQUIREMENTS=nose coverage virtualenv
 
 all: install
 install: clean
 	python setup.py sdist
-	pip install dist/*.tar.gz --upgrade
+	pip install `ls dist/efel-*.tar.gz`[neo] --upgrade
+virtualenv: clean
+	virtualenv pyenv
+	. ./pyenv/bin/activate	
 doc_efeatures:
 	rm -rf docs/build_efeatures && \
 	mkdir docs/build_efeatures && \
@@ -30,7 +33,7 @@ update_version:
 	git add GITHASH.txt && \
 	git add VERSION.txt && \
 	git commit -m 'Updated version number'
-test: install install_test_requirements
+test: virtualenv install install_test_requirements
 	cd efel/tests; nosetests -s -v -x --with-coverage --cover-xml \
 	   --cover-package efel 
 pypi: test
@@ -44,6 +47,7 @@ clean:
 	rm -rf build
 	rm -rf docs/build
 	rm -rf dist
+	rm -rf pyenv
 cpp:
 	mkdir -p build_cmake && \
 	cd build_cmake && \
diff --git a/setup.py b/setup.py
index 7255902..a6fc4ea 100644
--- a/setup.py
+++ b/setup.py
@@ -74,8 +74,8 @@
     name="efel",
     version=versioneer.get_version(),
     cmdclass=versioneer.get_cmdclass(),
-    install_requires=['numpy>=1.6', 'six', 'neo>=0.5.0', 'quantities',
-                      'scipy'],
+    install_requires=['numpy>=1.6', 'six'],
+    extras_require={'neo': ['neo>=0.5.0', 'scipy']},
     packages=['efel'],
     author="BlueBrain Project, EPFL",
     maintainer="Werner Van Geit",