diff --git a/cherab/__init__.py b/cherab/__init__.py
deleted file mode 100644
index 53af8cd3..00000000
--- a/cherab/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2016-2018 Euratom
-# Copyright 2016-2018 United Kingdom Atomic Energy Authority
-# Copyright 2016-2018 Centro de Investigaciones Energéticas, Medioambientales y Tecnológicas
-#
-# Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the
-# European Commission - subsequent versions of the EUPL (the "Licence");
-# You may not use this work except in compliance with the Licence.
-# You may obtain a copy of the Licence at:
-#
-# https://joinup.ec.europa.eu/software/page/eupl5
-#
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the Licence is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied.
-#
-# See the Licence for the specific language governing permissions and limitations
-# under the Licence.
-
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/dev/test.sh b/dev/test.sh
index 6132427b..edfbc452 100755
--- a/dev/test.sh
+++ b/dev/test.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-python -m unittest $1 $2 $3 $4 $5
+python -m unittest discover cherab $1 $2 $3 $4 $5
diff --git a/setup.py b/setup.py
index c57bb0d3..bee897ed 100644
--- a/setup.py
+++ b/setup.py
@@ -96,7 +96,6 @@
     name="cherab",
     version=version,
     license="EUPL 1.1",
-    namespace_packages=["cherab"],
     description="Cherab spectroscopy framework",
     classifiers=[
         "Development Status :: 5 - Production/Stable",