diff --git a/jshell-aws-backend/build.gradle b/jshell-aws-backend/build.gradle
index 3a758c3c14..1f37f4c29d 100644
--- a/jshell-aws-backend/build.gradle
+++ b/jshell-aws-backend/build.gradle
@@ -31,12 +31,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-}
-
-sourceSets {
-    test {
-        java {
-            srcDirs 'src/test/integration', 'src/test/unit'
-        }
-    }
 }
\ No newline at end of file
diff --git a/jshell-aws-backend/src/test/integration/org.togetherjava/jshell/CodeRunnerMockTest.java b/jshell-aws-backend/src/test/java/org/togetherjava/jshell/CodeRunnerAPITest.java
similarity index 96%
rename from jshell-aws-backend/src/test/integration/org.togetherjava/jshell/CodeRunnerMockTest.java
rename to jshell-aws-backend/src/test/java/org/togetherjava/jshell/CodeRunnerAPITest.java
index e498120c83..7f812c5a40 100644
--- a/jshell-aws-backend/src/test/integration/org.togetherjava/jshell/CodeRunnerMockTest.java
+++ b/jshell-aws-backend/src/test/java/org/togetherjava/jshell/CodeRunnerAPITest.java
@@ -8,7 +8,6 @@
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -33,8 +32,7 @@
  *
  * @author Suraj Kumar
  */
-@Disabled // CodeQL can't run this test, but we have adequate unit tests
-class CodeRunnerMockTest {
+class CodeRunnerAPITest {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
     private static final int HTTP_PORT = 3001;
     private static final String API_URL = "http://localhost:%d/".formatted(HTTP_PORT);
diff --git a/jshell-aws-backend/src/test/unit/org/togetherjava/jshell/CodeRunnerTest.java b/jshell-aws-backend/src/test/java/org/togetherjava/jshell/CodeRunnerTest.java
similarity index 100%
rename from jshell-aws-backend/src/test/unit/org/togetherjava/jshell/CodeRunnerTest.java
rename to jshell-aws-backend/src/test/java/org/togetherjava/jshell/CodeRunnerTest.java