diff --git a/.travis.yml b/.travis.yml
index 169bf25..934b3bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ python:
   - "3.4"
   - "3.5"
 
-before_install: pip install --quiet lxml python-dateutil
+before_install:
+    python setup.py bdist_wheel --include-test-subpackage
+    pip install dist/feedgen*
 
-script: make test
+script:
+    make test
diff --git a/Makefile b/Makefile
index 4ae3541..e9457b4 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ publish_wheel: sdist
 	python setup.py bdist_wheel upload
 
 test:
-	python -m unittest feedgen.tests.test_feed
-	python -m unittest feedgen.tests.test_entry
-	python -m unittest feedgen.tests.test_extension
+	python -I -m unittest feedgen.tests.test_feed
+	python -I -m unittest feedgen.tests.test_entry
+	python -I -m unittest feedgen.tests.test_extension
 	@rm -f tmp_Atomfeed.xml tmp_Rssfeed.xml
diff --git a/setup.py b/setup.py
index a96055e..fbe8984 100755
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,25 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import sys
+MAGIC_BUILD_FLAG = '--include-test-subpackage'
+if MAGIC_BUILD_FLAG in sys.argv:
+    sys.argv.remove(MAGIC_BUILD_FLAG)
+    with_tests = True
+else:
+    with_tests = False
+
 import setuptools
 from distutils.core import setup
 import feedgen.version
 
+packages = ['feedgen', 'feedgen/ext']
+if with_tests:
+    packages.append('feedgen/tests')
+
 setup(
 		name = 'feedgen',
-		packages = ['feedgen', 'feedgen/ext'],
+		packages = packages,
 		version = feedgen.version.version_full_str,
 		description = 'Feed Generator (ATOM, RSS, Podcasts)',
 		author = 'Lars Kiesow',