diff --git a/.travis.yml b/.travis.yml
index 53a96738..4d33e3c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -138,10 +138,9 @@ install:
 
 script:
   # slycots own unit tests as installed, not those from source dir
-  - mkdir ../slycot-coverage
-  - cd ../slycot-coverage
-  - slycot_dir=$(python -c "import slycot; print(slycot.__path__[0])")
-  - pytest --pyargs slycot --cov=$slycot_dir --cov-config=../Slycot/.coveragerc
+  - slycot_dir=$(python -c "import sys; sys.path = sys.path[1:]; import slycot; print(slycot.__path__[0])")
+  - pytest --cov=$slycot_dir
+  - mv .coverage .coverage.slycot
   #
   # As a deeper set of tests, use the suite from python-control master branch as well
   - cd ..
@@ -153,7 +152,6 @@ script:
 after_success:
   # go back to Slycot dir and merge the coverage to report correct repo data with coveralls
   - cd ../Slycot
-  - cp ../slycot-coverage/.coverage .coverage.slycot
   - cp ../python-control/.coverage .coverage.control
   - echo "  $slycot_dir" >> .coveragerc
   - coverage combine
diff --git a/setup.py b/setup.py
index 9e1e6dfc..7c4054e2 100644
--- a/setup.py
+++ b/setup.py
@@ -229,7 +229,7 @@ def setup_package():
 
     metadata = dict(
         name='slycot',
-        packages=['slycot', 'slycot.tests'],
+        packages=['slycot'],
         cmake_languages=('C', 'Fortran'),
         version=VERSION,
         maintainer="Slycot developers",
diff --git a/slycot/CMakeLists.txt b/slycot/CMakeLists.txt
index fd84ef0b..869227a5 100644
--- a/slycot/CMakeLists.txt
+++ b/slycot/CMakeLists.txt
@@ -167,4 +167,3 @@ python_extension_module(${SLYCOT_MODULE})
 install(TARGETS ${SLYCOT_MODULE} DESTINATION slycot)
 install(FILES ${PYSOURCE} DESTINATION slycot)
 
-add_subdirectory(tests)
diff --git a/slycot/tests/CMakeLists.txt b/slycot/tests/CMakeLists.txt
deleted file mode 100644
index ec4b5ea1..00000000
--- a/slycot/tests/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-set(PYSOURCE
-
-  __init__.py
-  test_ab08n.py
-  test_ag08bd.py
-  test_examples.py
-  test_mb.py
-  test_mc.py
-  test_sb.py
-  test_sg02ad.py
-  test_sg03ad.py
-  test_tb05ad.py
-  test_td04ad.py
-  test_tg01ad.py
-  test_tg01fd.py )
-
-install(FILES ${PYSOURCE}
-        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                    GROUP_READ GROUP_EXECUTE
-                    WORLD_READ WORLD_EXECUTE
-        DESTINATION slycot/tests)
diff --git a/slycot/tests/__init__.py b/slycot/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/slycot/tests/test_ab08n.py b/tests/test_ab08n.py
similarity index 100%
rename from slycot/tests/test_ab08n.py
rename to tests/test_ab08n.py
diff --git a/slycot/tests/test_ag08bd.py b/tests/test_ag08bd.py
similarity index 100%
rename from slycot/tests/test_ag08bd.py
rename to tests/test_ag08bd.py
diff --git a/slycot/tests/test_examples.py b/tests/test_examples.py
similarity index 100%
rename from slycot/tests/test_examples.py
rename to tests/test_examples.py
diff --git a/slycot/tests/test_mb.py b/tests/test_mb.py
similarity index 100%
rename from slycot/tests/test_mb.py
rename to tests/test_mb.py
diff --git a/slycot/tests/test_mc.py b/tests/test_mc.py
similarity index 100%
rename from slycot/tests/test_mc.py
rename to tests/test_mc.py
diff --git a/slycot/tests/test_sb.py b/tests/test_sb.py
similarity index 100%
rename from slycot/tests/test_sb.py
rename to tests/test_sb.py
diff --git a/slycot/tests/test_sg02ad.py b/tests/test_sg02ad.py
similarity index 100%
rename from slycot/tests/test_sg02ad.py
rename to tests/test_sg02ad.py
diff --git a/slycot/tests/test_sg03ad.py b/tests/test_sg03ad.py
similarity index 100%
rename from slycot/tests/test_sg03ad.py
rename to tests/test_sg03ad.py
diff --git a/slycot/tests/test_tb05ad.py b/tests/test_tb05ad.py
similarity index 100%
rename from slycot/tests/test_tb05ad.py
rename to tests/test_tb05ad.py
diff --git a/slycot/tests/test_td04ad.py b/tests/test_td04ad.py
similarity index 100%
rename from slycot/tests/test_td04ad.py
rename to tests/test_td04ad.py
diff --git a/slycot/tests/test_tg01ad.py b/tests/test_tg01ad.py
similarity index 100%
rename from slycot/tests/test_tg01ad.py
rename to tests/test_tg01ad.py
diff --git a/slycot/tests/test_tg01fd.py b/tests/test_tg01fd.py
similarity index 100%
rename from slycot/tests/test_tg01fd.py
rename to tests/test_tg01fd.py