diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9737d5fe8..ac3e2074c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,10 +24,10 @@ jobs:
           java-version: '11'
           cache: 'gradle'
 
-      - name: Setup Python 3.9
+      - name: Setup Python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
 
       - name: Cache Jars & Data
         id: cache-rapidwright
diff --git a/build.gradle b/build.gradle
index 72f6b52a4..b9f81801b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -212,8 +212,6 @@ task testPython(type:Test) {
       args = ['-m', 'pytest', '--junitxml', '$buildDir/test-results/testPython/testPython.xml', '--rootdir', 'python/test']
       // Enable verbose flag which prints out a pass/fail for every test
       args += ['-v']
-      // Prevent python/tests/... with the same namespace as in Java from clobbering
-      args += ['--import-mode=importlib']
       // Workaround from https://github.com/jpype-project/jpype/issues/842#issuecomment-847027355
       args += ['-p', 'no:faulthandler']
       if (!filter.commandLineIncludePatterns.isEmpty()) {
diff --git a/python/test/com/__init__.py b/python/test/com/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/python/test/com/xilinx/__init__.py b/python/test/com/xilinx/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/python/test/com/xilinx/rapidwright/__init__.py b/python/test/com/xilinx/rapidwright/__init__.py
deleted file mode 100644
index e69de29bb..000000000