diff --git a/MANIFEST.in b/MANIFEST.in
index a68c043e6..db0e2ed6c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
 include LICENSE CONTRIBUTORS README.rst
 graft test
+prune test/tools
 recursive-exclude * *.pyc *.pyo *.swo *.swp
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 000000000..3480374bc
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
\ No newline at end of file
diff --git a/setup.py b/setup.py
index a3691ab95..bcaecad46 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ setup(
         "Topic :: Software Development :: Testing",
         "Topic :: Software Development :: Testing :: Traffic Generation",
     ],
-    packages=find_packages(),
+    packages=find_packages(exclude=["test", "test.*"]),
     include_package_data=True,
     zip_safe=False,
     install_requires=[
diff --git a/tools/getcertnames b/test/tools/getcertnames
old mode 100755
new mode 100644
similarity index 100%
rename from tools/getcertnames
rename to test/tools/getcertnames