diff --git a/setup.py b/setup.py
index 2e4222c..9427f18 100644
--- a/setup.py
+++ b/setup.py
@@ -21,13 +21,24 @@ class SetupPythonEnvironment(MyCommand):
 
     def run(self):
         python_bin = sys.executable if sys.executable else 'python'
-        path = os.path.join('env', 'python')
-        prompt = '(dav)'
+        python_ver = sys.version_info.major
+        if python_ver == 2:
+            path = os.path.join('env', 'python2')
+            venv_module = 'virtualenv'
+            prompt = '(dav) '
+        elif python_ver == 3:
+            path = os.path.join('env', 'python3')
+            venv_module = 'venv'
+            prompt = 'dav3'
+        else:
+            sys.stderr.write('Python %d is not supported.\n' % python_ver)
+            sys.exit(posix.EX_USAGE)
 
         print('Creating new python environment in {path}'.format(path=path))
-        cmd = ('{bin} -m virtualenv'
+        cmd = ('{bin} -m {venv_module}'
                ' --prompt="{prompt}"'
-               ' {path}'.format(bin=python_bin, path=path, prompt=prompt))
+               ' {path}'.format(bin=python_bin, path=path,
+                                venv_module=venv_module, prompt=prompt))
         os.system(cmd)
 
         print('')
@@ -76,11 +87,6 @@ class QuickSetup(MyCommand):
         os.system(cmd)
 
 
-if sys.version_info.major != 2:
-    sys.stderr.write('This is not python 2. I want python 2.\n')
-    sys.exit(posix.EX_USAGE)
-
-
 setup(
     name='django-dav-events',
     version='1.0',
@@ -107,6 +113,8 @@ setup(
         'django-bootstrap3',
         'django-countries',
         'django-datetime-widget',
+        'selenium',
+        'coverage',
     ],
     extras_require={
         'production': ['psycopg2'],