diff --git a/kong/__init__.py b/kong/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/kong/__init__.py
diff --git a/tests/990_test_skip_examples.py b/kong/tests/990_test_skip_examples.py
similarity index 98%
rename from tests/990_test_skip_examples.py
rename to kong/tests/990_test_skip_examples.py
index 6b05d1c..477e49e 100644
--- a/tests/990_test_skip_examples.py
+++ b/kong/tests/990_test_skip_examples.py
@@ -21,7 +21,7 @@
 """
 
 import os
-import tests
+from kong import tests
 
 
 class TestSkipExamples(tests.FunctionalTest):
diff --git a/tests/994_test_rabbitmq.py b/kong/tests/994_test_rabbitmq.py
similarity index 99%
rename from tests/994_test_rabbitmq.py
rename to kong/tests/994_test_rabbitmq.py
index f0e6fe4..7f6dfd1 100644
--- a/tests/994_test_rabbitmq.py
+++ b/kong/tests/994_test_rabbitmq.py
@@ -17,7 +17,7 @@
 
 """Functional test case to check RabbitMQ """
 import pika
-import tests
+from kong import tests
 
 from pprint import pprint
 #RABBITMQ_HOST = get_config("rabbitmq/host")
diff --git a/tests/995_test_swift.py b/kong/tests/995_test_swift.py
similarity index 99%
rename from tests/995_test_swift.py
rename to kong/tests/995_test_swift.py
index c81b3cb..2ecfd08 100644
--- a/tests/995_test_swift.py
+++ b/kong/tests/995_test_swift.py
@@ -22,7 +22,7 @@
 
 from pprint import pprint
 
-import tests
+from kong import tests
 
 SMALL_OBJ = "include/swift_objects/swift_small"
 MED_OBJ = "include/swift_objects/swift_medium"
diff --git a/tests/996_test_glance.py b/kong/tests/996_test_glance.py
similarity index 99%
rename from tests/996_test_glance.py
rename to kong/tests/996_test_glance.py
index fc8ce64..3fd6b15 100644
--- a/tests/996_test_glance.py
+++ b/kong/tests/996_test_glance.py
@@ -21,7 +21,7 @@
 import os
 from pprint import pprint
 
-import tests
+from kong import tests
 
 
 class TestGlanceAPI(tests.FunctionalTest):
diff --git a/tests/998_test_nova.py b/kong/tests/998_test_nova.py
similarity index 99%
rename from tests/998_test_nova.py
rename to kong/tests/998_test_nova.py
index a3bce14..90a153b 100644
--- a/tests/998_test_nova.py
+++ b/kong/tests/998_test_nova.py
@@ -24,7 +24,7 @@
 
 from pprint import pprint
 
-import tests
+from kong import tests
 
 
 class TestNovaAPI(tests.FunctionalTest):
diff --git a/tests/999_test_cleanup.py b/kong/tests/999_test_cleanup.py
similarity index 99%
rename from tests/999_test_cleanup.py
rename to kong/tests/999_test_cleanup.py
index 5a66b36..9e435da 100644
--- a/tests/999_test_cleanup.py
+++ b/kong/tests/999_test_cleanup.py
@@ -21,7 +21,7 @@
 
 from pprint import pprint
 
-import tests
+from kong import tests
 
 
 class TestCleanUp(tests.FunctionalTest):
diff --git a/tests/__init__.py b/kong/tests/__init__.py
similarity index 97%
rename from tests/__init__.py
rename to kong/tests/__init__.py
index 9dcb9be..2e6fc71 100644
--- a/tests/__init__.py
+++ b/kong/tests/__init__.py
@@ -145,7 +145,8 @@
 
     def _parse_defaults_file(self):
         cfg = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                   "..", "etc", "config.ini"))
+                                   os.path.pardir, os.path.pardir,
+                                   "etc", "config.ini"))
         if os.path.exists(cfg):
             self._build_config(cfg)
         else: