diff --git a/.gitignore b/.gitignore
index 277e3c4..c5251e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@
 .DS_Store
 /setup.cfg
 .idea
-
+__pycache__/
diff --git a/setup.py b/setup.py
index 1ef9e6f..6695db2 100644
--- a/setup.py
+++ b/setup.py
@@ -30,10 +30,7 @@
 except ImportError:
     pass
 
-try:
-    from setuptools import setup, find_packages
-except ImportError:
-    from distutils.core import setup, find_packages
+from setuptools import setup, find_packages, find_namespace_packages
 
 version = tika.__version__
 
@@ -87,7 +84,7 @@ def read(*rnames):
     url='http://github.com/chrismattmann/tika-python',
     download_url='http://github.com/chrismattmann/tika-python',
     license='Apache License version 2 ("ALv2")',
-    packages=find_packages(exclude=['ez_setup']),
+    packages=find_packages(exclude=['ez_setup']) + find_namespace_packages(include=['tika.tests']),
     include_package_data=True,
     zip_safe=True,
     test_suite='tika.tests',
@@ -101,7 +98,7 @@ def read(*rnames):
         # for the package
     },
     install_requires=[
-        'setuptools',
+        'setuptools>=40.1',
         'requests'
     ],
     extras_require=extras_require,
diff --git a/tika/tests/__init__.py b/tika/tests/__init__.py
deleted file mode 100644
index 8becdba..0000000
--- a/tika/tests/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# encoding: utf-8
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)