diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e1c97883ca..3d0da63bfd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -241,6 +241,15 @@ jobs:
         run: |
           tox -e pretest
 
+      - name: "Test API test_entry"
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 10
+          max_attempts: 2
+          shell: bash
+          command: |
+            tox -e test-api_entry,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
+
       - name: "Run compatible tests in parallel"
         uses: nick-fields/retry@v3
         with:
diff --git a/tox.ini b/tox.ini
index 1e352c01e4..ade6eba8c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,9 +32,9 @@ description = Default tox environment list and core configurations
 envlist = pretest,test-{api,launcher,server,local_server,multi_server,api_entry,custom_type_field,operators,workflow,remote_workflow,remote_operator,service},posttest,kill-servers
 
 labels =
-    localparalleltests = pretest,test-{api,launcher,server,local_server,multi_server,api_entry,custom_type_field,operators},posttest,kill-servers
+    localparalleltests = pretest,test-{api,launcher,server,local_server,multi_server,custom_type_field,operators},posttest,kill-servers
     othertests = pretest,test-{workflow,remote_workflow,remote_operator,service},posttest,kill-servers
-    ciparalleltests = test-{api,launcher,local_server,multi_server,api_entry,custom_type_field,operators},kill-servers
+    ciparalleltests = test-{api,launcher,local_server,multi_server,custom_type_field,operators},kill-servers
     
 isolated_build_env = build