diff --git a/.github/workflows/ubuntu-tests.yml b/.github/workflows/ubuntu-tests.yml
index f8069c8f5..ac094d3b7 100644
--- a/.github/workflows/ubuntu-tests.yml
+++ b/.github/workflows/ubuntu-tests.yml
@@ -38,5 +38,4 @@ jobs:
 
     - name: Run tests
       run: |
-        pytest --ignore=tests/test_help.py
-        pytest tests/test_help.py
+        pytest
diff --git a/.github/workflows/windows-tests.yml b/.github/workflows/windows-tests.yml
index 1d7d465db..431326fc4 100644
--- a/.github/workflows/windows-tests.yml
+++ b/.github/workflows/windows-tests.yml
@@ -38,6 +38,5 @@ jobs:
 
     - name: Run tests
       run: |
-        pytest --ignore=tests/test_help.py
-        pytest tests/test_help.py
+        pytest
         
diff --git a/pytest.ini b/pytest.ini
index d0da0980d..fc6f43f51 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,8 @@
 [pytest]
 norecursedirs = tmp.* build benchmark _site OLD
 addopts = -p no:warnings
+testpaths =
+    tests/basic
+    tests/help
+    
 
diff --git a/tests/test_coder.py b/tests/basic/test_coder.py
similarity index 100%
rename from tests/test_coder.py
rename to tests/basic/test_coder.py
diff --git a/tests/test_commands.py b/tests/basic/test_commands.py
similarity index 100%
rename from tests/test_commands.py
rename to tests/basic/test_commands.py
diff --git a/tests/test_editblock.py b/tests/basic/test_editblock.py
similarity index 100%
rename from tests/test_editblock.py
rename to tests/basic/test_editblock.py
diff --git a/tests/test_io.py b/tests/basic/test_io.py
similarity index 100%
rename from tests/test_io.py
rename to tests/basic/test_io.py
diff --git a/tests/test_main.py b/tests/basic/test_main.py
similarity index 100%
rename from tests/test_main.py
rename to tests/basic/test_main.py
diff --git a/tests/test_models.py b/tests/basic/test_models.py
similarity index 100%
rename from tests/test_models.py
rename to tests/basic/test_models.py
diff --git a/tests/test_repo.py b/tests/basic/test_repo.py
similarity index 100%
rename from tests/test_repo.py
rename to tests/basic/test_repo.py
diff --git a/tests/test_repomap.py b/tests/basic/test_repomap.py
similarity index 100%
rename from tests/test_repomap.py
rename to tests/basic/test_repomap.py
diff --git a/tests/test_sendchat.py b/tests/basic/test_sendchat.py
similarity index 100%
rename from tests/test_sendchat.py
rename to tests/basic/test_sendchat.py
diff --git a/tests/test_udiff.py b/tests/basic/test_udiff.py
similarity index 100%
rename from tests/test_udiff.py
rename to tests/basic/test_udiff.py
diff --git a/tests/test_urls.py b/tests/basic/test_urls.py
similarity index 100%
rename from tests/test_urls.py
rename to tests/basic/test_urls.py
diff --git a/tests/test_wholefile.py b/tests/basic/test_wholefile.py
similarity index 100%
rename from tests/test_wholefile.py
rename to tests/basic/test_wholefile.py
diff --git a/tests/test_help.py b/tests/help/test_help.py
similarity index 100%
rename from tests/test_help.py
rename to tests/help/test_help.py