diff --git a/setup.cfg b/setup.cfg
index ca336e153..fdf70c420 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,3 +16,6 @@ domain=wtforms
 input_file=wtforms/locale/wtforms.pot
 output_dir=wtforms/locale/
 domain=wtforms
+
+[wheel]
+universal=1
diff --git a/setup.py b/setup.py
index a7030ea13..b8b460aa3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,22 +1,11 @@
 import sys
+from setuptools import setup
 
 extra = {}
 
-try:
-    from setuptools import setup
-    has_setuptools = True
-    extra['test_suite'] = 'tests.runtests'
-    extra['extras_require'] = {
-        'Locale': ['Babel>=1.3'],
-    }
-    if sys.version_info < (2, 7):
-        extra['install_requires'] = ['ordereddict>=1.1']
-except ImportError:
-    from distutils.core import setup
-    has_setuptools = False
+if sys.version_info < (2, 7):
+    extra['install_requires'] = ['ordereddict>=1.1']
 
-if sys.version_info >= (3,) and not has_setuptools:
-    raise Exception('Python 3 support requires setuptools.')
 
 setup(
     name='WTForms',
@@ -57,5 +46,9 @@
     package_data={
         'wtforms': ['locale/wtforms.pot', 'locale/*/*/*'],
     },
+    test_suite='tests.runtests',
+    extras_require={
+        'Locale': ['Babel>=1.3'],
+    },
     **extra
 )