diff --git a/src/hovermap_api/scripts/configure_perception b/src/hovermap_api/scripts/configure_perception
index 9c27287..40dbf4d 100644
--- a/src/hovermap_api/scripts/configure_perception
+++ b/src/hovermap_api/scripts/configure_perception
@@ -13,7 +13,9 @@ def get_perception_config() -> str:
 
 if __name__ == "__main__":
     rospy.init_node("hovermap_api_config")
-    pub = rospy.Publisher("cortex/occupancy_grid_map/configuration", String, queue_size=10)
+    pub = rospy.Publisher(
+        "cortex/occupancy_grid_map/configuration", String, queue_size=10
+    )
     msg = String()
     msg.data = get_perception_config()
     pub.publish(msg)
diff --git a/src/mule_bridge/mule_bridge/CMakeLists.txt b/src/mule_bridge/mule_bridge/CMakeLists.txt
index 48c490e..6fae5f1 100644
--- a/src/mule_bridge/mule_bridge/CMakeLists.txt
+++ b/src/mule_bridge/mule_bridge/CMakeLists.txt
@@ -13,7 +13,16 @@ catkin_package()
 catkin_install_python(PROGRAMS scripts/mule_bridge DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 if(CATKIN_ENABLE_TESTING)
-  catkin_add_nosetests(tests)
+
+  SET(PYTHON_TEST_TARGETS
+    tests/test_database.py
+    tests/test_history.py
+    tests/test_protocol.py
+  )
+
+  foreach(TEST_TARGET ${PYTHON_TEST_TARGETS})
+    catkin_add_nosetests(${TEST_TARGET})
+  endforeach()
 
   find_package(rostest REQUIRED)
   add_rostest(tests/test_bridge.test)
diff --git a/src/mule_bridge/mule_bridge/setup.py b/src/mule_bridge/mule_bridge/setup.py
index 4706cbb..3b8b7a0 100644
--- a/src/mule_bridge/mule_bridge/setup.py
+++ b/src/mule_bridge/mule_bridge/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 
 from catkin_pkg.python_setup import generate_distutils_setup
 
diff --git a/src/mule_bridge/mule_bridge/tests/test_database.py b/src/mule_bridge/mule_bridge/tests/test_database.py
index f4e9cb8..d8e17e4 100644
--- a/src/mule_bridge/mule_bridge/tests/test_database.py
+++ b/src/mule_bridge/mule_bridge/tests/test_database.py
@@ -456,9 +456,3 @@ def test(self):
             ),
             2.0,
         )
-
-
-if __name__ == "__main__":
-    import rosunit
-
-    rosunit.unitrun("test_mule_bridge", "test_database", TestDatabase)
diff --git a/src/mule_bridge/mule_bridge/tests/test_history.py b/src/mule_bridge/mule_bridge/tests/test_history.py
index fdd8703..4bb23bf 100644
--- a/src/mule_bridge/mule_bridge/tests/test_history.py
+++ b/src/mule_bridge/mule_bridge/tests/test_history.py
@@ -1,6 +1,6 @@
 import unittest
 
-import mule_bridge
+import mule_bridge # TODO FIX me tests fail to find zmq
 
 
 def size(blobs):
@@ -108,9 +108,3 @@ def test(self):
             ),
             2.0,
         )
-
-
-if __name__ == "__main__":
-    import rosunit
-
-    rosunit.unitrun("test_mule_bridge", "test_history", TestHistory)
diff --git a/src/mule_bridge/mule_bridge/tests/test_protocol.py b/src/mule_bridge/mule_bridge/tests/test_protocol.py
index e68b0a9..9409a27 100644
--- a/src/mule_bridge/mule_bridge/tests/test_protocol.py
+++ b/src/mule_bridge/mule_bridge/tests/test_protocol.py
@@ -86,9 +86,3 @@ def test(self):
             mule_bridge.loads_sync_reply(mule_bridge.dumps_sync_reply(sync_reply)),
             sync_reply,
         )
-
-
-if __name__ == "__main__":
-    import rosunit
-
-    rosunit.unitrun("test_mule_bridge", "test_protocol", TestProtocol)