diff --git a/MANIFEST.in b/MANIFEST.in
index d47f8bf79..3b0af23b2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
 include COPYING
 recursive-include po *.po
 recursive-include data *.1 *.in
+recursive-include test *.py
 recursive-exclude * *.pyc
diff --git a/setup.py b/setup.py
index 5cb9a1ff6..0dc931a80 100644
--- a/setup.py
+++ b/setup.py
@@ -173,7 +173,7 @@ data_files = data_files_app_icon
 setup(
     name = "gajim",
     description = 'A GTK+ Jabber client',
-    version=gajim.__version__,
+    version = gajim.__version__,
     author = "Philipp Hörist, Yann Leboulanger",
     author_email = "gajim-devel@gajim.org",
     url = 'https://gajim.org',
@@ -188,12 +188,13 @@ setup(
         'scripts/gajim',
         'scripts/gajim-history-manager',
         'scripts/gajim-remote' ],
-    packages = find_packages(exclude=["gajim.dev"]),
+    packages = find_packages(exclude=["gajim.dev", "test*"]),
     package_data = {'gajim': package_data},
     data_files = data_files,
-    install_requires=[
+    install_requires = [
           'dbus-python',
           'nbxmpp',
           'pyOpenSSL'
       ],
+      test_suite = 'test'
 )
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 000000000..e69de29bb