diff --git a/.travis.yml b/.travis.yml
index 188c97d..431eb1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
-dist: xenial
+dist: buster
 os: linux
 language: python
-python: '3.6'
+python: '3.7'
 stages:
   - lint
 env:
diff --git a/MANIFEST.in b/MANIFEST.in
index ae43c46..ac4dde8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,4 @@
-# Include the README
-include *.md
-
-# Include the license file
-include LICENSE.txt
+include *.md LICENSE.txt
 
 recursive-include doc *
 recursive-include basicswap/templates *
diff --git a/doc/install.md b/doc/install.md
new file mode 100644
index 0000000..e69de29
diff --git a/setup.py b/setup.py
index 7231ebe..65e89dc 100644
--- a/setup.py
+++ b/setup.py
@@ -36,5 +36,5 @@ setuptools.setup(
             "basicswap-prepare=bin.basicswap_prepare:main",
         ]
     },
-    test_suite="tests.test_suite"
+    test_suite="tests.basicswap.test_suite"
 )
diff --git a/tests/__init__.py b/tests/__init__.py
index 84bcea1..e69de29 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,14 +0,0 @@
-import unittest
-
-import tests.test_other
-import tests.test_prepare
-import tests.test_run
-
-
-def test_suite():
-    loader = unittest.TestLoader()
-    suite = loader.loadTestsFromModule(tests.test_other)
-    suite.addTests(loader.loadTestsFromModule(tests.test_prepare))
-    suite.addTests(loader.loadTestsFromModule(tests.test_run))
-
-    return suite
diff --git a/tests/basicswap/__init__.py b/tests/basicswap/__init__.py
new file mode 100644
index 0000000..bbdd140
--- /dev/null
+++ b/tests/basicswap/__init__.py
@@ -0,0 +1,14 @@
+import unittest
+
+import tests.basicswap.test_other as test_other
+import tests.basicswap.test_prepare as test_prepare
+import tests.basicswap.test_run as test_run
+
+
+def test_suite():
+    loader = unittest.TestLoader()
+    suite = loader.loadTestsFromModule(test_other)
+    suite.addTests(loader.loadTestsFromModule(test_prepare))
+    suite.addTests(loader.loadTestsFromModule(test_run))
+
+    return suite
diff --git a/tests/test_nmc.py b/tests/basicswap/test_nmc.py
similarity index 100%
rename from tests/test_nmc.py
rename to tests/basicswap/test_nmc.py
diff --git a/tests/test_other.py b/tests/basicswap/test_other.py
similarity index 100%
rename from tests/test_other.py
rename to tests/basicswap/test_other.py
diff --git a/tests/test_prepare.py b/tests/basicswap/test_prepare.py
similarity index 100%
rename from tests/test_prepare.py
rename to tests/basicswap/test_prepare.py
diff --git a/tests/test_run.py b/tests/basicswap/test_run.py
similarity index 100%
rename from tests/test_run.py
rename to tests/basicswap/test_run.py