diff --git a/setup.cfg b/setup.cfg
index de74a8f5..02321d2f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [tool:pytest]
-testpaths = t/
+testpaths = t/unit/
 python_classes = test_*
 
 [build_sphinx]
diff --git a/funtests/__init__.py b/t/integration/__init__.py
similarity index 100%
rename from funtests/__init__.py
rename to t/integration/__init__.py
diff --git a/funtests/setup.cfg b/t/integration/setup.cfg
similarity index 100%
rename from funtests/setup.cfg
rename to t/integration/setup.cfg
diff --git a/funtests/setup.py b/t/integration/setup.py
similarity index 100%
rename from funtests/setup.py
rename to t/integration/setup.py
diff --git a/funtests/tests/__init__.py b/t/integration/tests/__init__.py
similarity index 100%
rename from funtests/tests/__init__.py
rename to t/integration/tests/__init__.py
diff --git a/funtests/tests/test_SLMQ.py b/t/integration/tests/test_SLMQ.py
similarity index 100%
rename from funtests/tests/test_SLMQ.py
rename to t/integration/tests/test_SLMQ.py
diff --git a/funtests/tests/test_SQS.py b/t/integration/tests/test_SQS.py
similarity index 100%
rename from funtests/tests/test_SQS.py
rename to t/integration/tests/test_SQS.py
diff --git a/funtests/tests/test_amqp.py b/t/integration/tests/test_amqp.py
similarity index 100%
rename from funtests/tests/test_amqp.py
rename to t/integration/tests/test_amqp.py
diff --git a/funtests/tests/test_librabbitmq.py b/t/integration/tests/test_librabbitmq.py
similarity index 100%
rename from funtests/tests/test_librabbitmq.py
rename to t/integration/tests/test_librabbitmq.py
diff --git a/funtests/tests/test_mongodb.py b/t/integration/tests/test_mongodb.py
similarity index 100%
rename from funtests/tests/test_mongodb.py
rename to t/integration/tests/test_mongodb.py
diff --git a/funtests/tests/test_pyamqp.py b/t/integration/tests/test_pyamqp.py
similarity index 100%
rename from funtests/tests/test_pyamqp.py
rename to t/integration/tests/test_pyamqp.py
diff --git a/funtests/tests/test_qpid.py b/t/integration/tests/test_qpid.py
similarity index 100%
rename from funtests/tests/test_qpid.py
rename to t/integration/tests/test_qpid.py
diff --git a/funtests/tests/test_redis.py b/t/integration/tests/test_redis.py
similarity index 100%
rename from funtests/tests/test_redis.py
rename to t/integration/tests/test_redis.py
diff --git a/funtests/tests/test_zookeeper.py b/t/integration/tests/test_zookeeper.py
similarity index 100%
rename from funtests/tests/test_zookeeper.py
rename to t/integration/tests/test_zookeeper.py
diff --git a/funtests/transport.py b/t/integration/transport.py
similarity index 100%
rename from funtests/transport.py
rename to t/integration/transport.py
diff --git a/t/conftest.py b/t/unit/conftest.py
similarity index 100%
rename from t/conftest.py
rename to t/unit/conftest.py