diff --git a/libs/python/agent/tests/__init__.py b/libs/python/agent/tests/__init__.py
deleted file mode 100644
index a10b299e..00000000
--- a/libs/python/agent/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Unit tests for cua-agent package."""
diff --git a/libs/python/computer-server/tests/__init__.py b/libs/python/computer-server/tests/__init__.py
deleted file mode 100644
index 42fe8f98..00000000
--- a/libs/python/computer-server/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Unit tests for cua-computer-server package."""
diff --git a/libs/python/computer/tests/__init__.py b/libs/python/computer/tests/__init__.py
deleted file mode 100644
index 9543232f..00000000
--- a/libs/python/computer/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Unit tests for cua-computer package."""
diff --git a/libs/python/core/tests/__init__.py b/libs/python/core/tests/__init__.py
deleted file mode 100644
index e992ab29..00000000
--- a/libs/python/core/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Unit tests for cua-core package."""
diff --git a/libs/python/mcp-server/tests/__init__.py b/libs/python/mcp-server/tests/__init__.py
deleted file mode 100644
index 3bb97e04..00000000
--- a/libs/python/mcp-server/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Unit tests for cua-mcp-server package."""
diff --git a/libs/python/mcp-server/tests/test_mcp_server.py b/libs/python/mcp-server/tests/test_mcp_server.py
index d9fbf7bd..ecab0868 100644
--- a/libs/python/mcp-server/tests/test_mcp_server.py
+++ b/libs/python/mcp-server/tests/test_mcp_server.py
@@ -19,6 +19,8 @@ class TestMCPServerImports:
             assert mcp_server is not None
         except ImportError:
             pytest.skip("mcp_server module not installed")
+        except SystemExit:
+            pytest.skip("MCP dependencies (mcp.server.fastmcp) not available")
 
 
 class TestMCPServerInitialization:
@@ -32,6 +34,8 @@ class TestMCPServerInitialization:
             assert server is not None
         except ImportError:
             pytest.skip("MCP server module not available")
+        except SystemExit:
+            pytest.skip("MCP dependencies (mcp.server.fastmcp) not available")
         except Exception as e:
             # Some initialization errors are acceptable in unit tests
             pytest.skip(f"MCP server initialization requires specific setup: {e}")
diff --git a/libs/python/pylume/tests/__init__.py b/libs/python/pylume/tests/__init__.py
deleted file mode 100644
index 6e2698b3..00000000
--- a/libs/python/pylume/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Unit tests for pylume package."""
diff --git a/libs/python/som/tests/__init__.py b/libs/python/som/tests/__init__.py
deleted file mode 100644
index 7b2febbc..00000000
--- a/libs/python/som/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Unit tests for som package."""