diff --git a/requirements-test.txt b/requirements-test.txt
index f789bf8..87bbd05 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -5,5 +5,5 @@ mock>=1.0.1
 nose>=1.3.0
 django-nose>=1.2
 flake8
-https://github.com/nephila/djangocms-helper/archive/develop.zip
+djangocms-helper>=0.7
 tox>=1.8
diff --git a/setup.py b/setup.py
index acf4149..170b9e6 100755
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,6 @@ setup(
         'django-cms>=3.0',
         'django-taggit',
         'django-filer',
-        'django-select2' if sys.version_info[0]==2 else 'django-select2-py3',
         'pytz',
         'django-taggit-templatetags',
         'django-taggit-autosuggest',
@@ -52,6 +51,12 @@ setup(
         'django-meta-mixin>=0.1.1',
         'south>=1.0.1',
     ],
+    extras_require={
+      ":python_version=='3.3'": ['django-select2-py3'],
+      ":python_version=='3.4'": ['django-select2-py3'],
+      ":python_version=='2.6'": ['django-select2'],
+      ":python_version=='2.7'": ['django-select2'],
+    },
     license="BSD",
     zip_safe=False,
     keywords='djangocms-blog, blog, django, wordpress, multilingual',
diff --git a/tox.ini b/tox.ini
index 50cac40..c6ca027 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,12 +2,14 @@
 envlist = py{26}-django{15,16},py{27,33,34}-django{15,16,17}
 
 [testenv]
-# temporary fix for pip-setuptools / django CMS issues
-install_command = ./tox_pip.sh {opts} {packages}
 deps =
     django15: Django>=1.5,<1.6
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
     py26: unittest2
+    py26: django-select2
+    py27: django-select2
+    py33: django-select2-py3
+    py34: django-select2-py3
     -r{toxinidir}/requirements-test.txt
 commands = {env:COMMAND:python} setup.py test