diff --git a/airbyte-commons-worker/src/test/java/io/airbyte/workers/process/DockerProcessFactoryTest.java b/airbyte-commons-worker/src/test/java/io/airbyte/workers/process/DockerProcessFactoryTest.java
index 7e42eda6a7e..daaa3478b09 100644
--- a/airbyte-commons-worker/src/test/java/io/airbyte/workers/process/DockerProcessFactoryTest.java
+++ b/airbyte-commons-worker/src/test/java/io/airbyte/workers/process/DockerProcessFactoryTest.java
@@ -123,7 +123,6 @@ void testEnvMapSet() throws IOException, WorkerException, InterruptedException {
 
     final WorkerConfigs workerConfigs = spy(new WorkerConfigs(new EnvConfigs()));
     when(workerConfigs.getEnvMap()).thenReturn(Map.of("ENV_VAR_1", "ENV_VALUE_1"));
-    when(workerConfigs.getEnvMap()).thenReturn(Map.of("ENV_VAR_1", "ENV_VALUE_1"));
 
     final DockerProcessFactory processFactory =
         new DockerProcessFactory(
diff --git a/airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/WorkspacePersistence.java b/airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/WorkspacePersistence.java
index 0493db51289..836bbfda4f1 100644
--- a/airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/WorkspacePersistence.java
+++ b/airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/WorkspacePersistence.java
@@ -48,9 +48,11 @@ public List<StandardWorkspace> listWorkspacesByOrganizationId(final ResourcesByO
         .toList();
   }
 
+  /**
+   * Find the workspace with the given ID and check if its organization ID is null. If so, update it.
+   * Otherwise, log a warning and do nothing.
+   */
   public void setOrganizationIdIfNull(final UUID workspaceId, final UUID organizationId) throws IOException {
-    // find the workspace with the given ID and check if its organization ID is null. If so, update it.
-    // otherwise, log a warning and do nothing.
     database.transaction(ctx -> {
       final boolean isExistingWorkspace = ctx.fetchExists(ctx.selectFrom(WORKSPACE).where(WORKSPACE.ID.eq(workspaceId)));
       if (isExistingWorkspace) {
diff --git a/airbyte-db/db-lib/src/test/java/io/airbyte/db/instance/configs/migrations/V0_50_21_001__BackfillActorDefaultVersionAndSetNonNullTest.java b/airbyte-db/db-lib/src/test/java/io/airbyte/db/instance/configs/migrations/V0_50_21_001__BackfillActorDefaultVersionAndSetNonNullTest.java
index 91b58f31561..b151845c13f 100644
--- a/airbyte-db/db-lib/src/test/java/io/airbyte/db/instance/configs/migrations/V0_50_21_001__BackfillActorDefaultVersionAndSetNonNullTest.java
+++ b/airbyte-db/db-lib/src/test/java/io/airbyte/db/instance/configs/migrations/V0_50_21_001__BackfillActorDefaultVersionAndSetNonNullTest.java
@@ -69,6 +69,7 @@ private UUID getDefaultVersionIdForActorId(final DSLContext ctx, final UUID acto
     return actor.get(DEFAULT_VERSION_ID_COL);
   }
 
+  @SuppressWarnings("PMD.AvoidDuplicateLiterals")
   static void insertDependencies(final DSLContext ctx) {
     ctx.insertInto(WORKSPACE)
         .columns(
diff --git a/ci/oss/tasks.py b/ci/oss/tasks.py
index b0551ac903d..e2ec8f2fbfc 100644
--- a/ci/oss/tasks.py
+++ b/ci/oss/tasks.py
@@ -48,7 +48,6 @@ async def build_oss_backend_task(settings: OssSettings, ctx: PipelineContext, cl
                 .with_env_variable("VERSION", "dev")
                 .with_workdir("/airbyte/oss" if base_dir == "oss" else "/airbyte")
                 .with_exec(["./gradlew", ":airbyte-config:specs:downloadConnectorRegistry", "--rerun", "--build-cache", "--no-daemon"])
-                .with_exec(["./gradlew", "spotlessCheck"])
                 .with_exec(gradle_command + ["--scan"] if scan else gradle_command)
                 .with_exec(["rsync", "-az", "/root/.gradle/", "/root/gradle-cache"]) #TODO: Move this to a context manager
         )
@@ -176,7 +175,7 @@ async def test_oss_backend_task(client: Client, oss_build_result: Container, set
         .with_exec(["./run.sh"])
     )
     
-    gradle_command = ["./gradlew", "test", "-x", ":airbyte-webapp:test", "-x", "buildDockerImage", "--build-cache", "--no-daemon"]
+    gradle_command = ["./gradlew", "checK", "test", "-x", ":airbyte-webapp:test", "-x", "buildDockerImage", "--build-cache", "--no-daemon"]
 
     result = (
                 with_gradle(client, ctx, settings, directory=base_dir)