diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/DriverBaseITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/DriverBaseITCase.java
index 78b28e0..8c57088 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/DriverBaseITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/DriverBaseITCase.java
@@ -23,7 +23,6 @@ import org.apache.flink.graph.asm.dataset.ChecksumHashCode.Checksum;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
 import org.apache.flink.util.FlinkRuntimeException;

-import org.apache.commons.lang3.ArrayUtils;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 import org.junit.Assert;
@@ -190,10 +189,6 @@ extends MultipleProgramsTestBase {
 		switch (mode) {
 			case CLUSTER:
 			case COLLECTION:
-			case CLUSTER_WITH_CODEGENERATION_ENABLED:
-				args = ArrayUtils.add(args, "--__disable_object_reuse");
-				break;
-
 			case CLUSTER_OBJECT_REUSE:
 				// object reuse is enabled by default when executing drivers
 				break;
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MultipleProgramsTestBase.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MultipleProgramsTestBase.java
index a2d5899..1855b35 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MultipleProgramsTestBase.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MultipleProgramsTestBase.java
@@ -18,7 +18,6 @@

 package org.apache.flink.test.util;

-import org.apache.flink.runtime.codegeneration.SorterFactory;
 import org.apache.flink.runtime.minicluster.LocalFlinkMiniCluster;

 import org.junit.After;
@@ -67,7 +66,6 @@ public class MultipleProgramsTestBase extends TestBaseUtils {
 	public enum TestExecutionMode {
 		CLUSTER,
 		CLUSTER_OBJECT_REUSE,
-		CLUSTER_WITH_CODEGENERATION_ENABLED,
 		COLLECTION
 	}

@@ -101,10 +99,6 @@ public class MultipleProgramsTestBase extends TestBaseUtils {
 			case CLUSTER_OBJECT_REUSE:
 				new TestEnvironment(cluster, 4, true).setAsContext();
 				break;
-			case CLUSTER_WITH_CODEGENERATION_ENABLED:
-				new TestEnvironment(cluster, 4, false, true).setAsContext();
-				SorterFactory.getInstance().forceCodeGeneration = true; // Fail fast if an error occurs with codegen
-				break;
 			case COLLECTION:
 				new CollectionTestEnvironment().setAsContext();
 				break;
@@ -151,7 +145,6 @@ public class MultipleProgramsTestBase extends TestBaseUtils {
 	public static Collection<Object[]> executionModes() {
 		return Arrays.asList(
 				new Object[] { TestExecutionMode.CLUSTER },
-				new Object[] { TestExecutionMode.CLUSTER_WITH_CODEGENERATION_ENABLED },
 				new Object[] { TestExecutionMode.COLLECTION });
 	}
 }