diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 4a9dfc8042..0abacb3d3d 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -312,10 +312,10 @@ artifacts.add(collectTestDataJar.name, collectTestData.map { it.destinationDirec
 
 ////////////////////////////////////////////////////////////////////////
 //
-//  collect "com.ibm.wala.core.testdata_1.0.0a.jar"
+//  collect "com.ibm.wala.core.testdata_1.0.0a.jar" for Dalvik tests
 //
 
-val collectTestDataA by
+val collectTestDataAForDalvik by
     tasks.registering(Jar::class) {
       archiveFileName = "com.ibm.wala.core.testdata_1.0.0a.jar"
       from(compileTestSubjectsJava)
@@ -323,10 +323,8 @@ val collectTestDataA by
       includeEmptyDirs = false
       destinationDirectory = layout.buildDirectory.dir(name)
       exclude(
-          // This is an invalid class so don't include it, e.g., it causes D8 to crash
+          // This is an invalid class so don't include it; it causes D8 to crash
           "**/CodeDeleted.class",
-          //          "**/SortingExample.class",
-          //          "**/A.class",
       )
     }
 
@@ -387,7 +385,7 @@ val dalvikTestResources: Configuration by configurations.creating { isCanBeResol
 
 listOf(
         collectJLex,
-        collectTestDataA,
+        collectTestDataAForDalvik,
         downloadJavaCup,
         extractBcel,
     )
diff --git a/dalvik/build.gradle.kts b/dalvik/build.gradle.kts
index 50f40d0f31..4d8891fb04 100644
--- a/dalvik/build.gradle.kts
+++ b/dalvik/build.gradle.kts
@@ -192,12 +192,6 @@ if (isWindows) tasks.named<Test>("test") { exclude("**/droidbench/**") }
 else sourceSets.test.configure { resources.srcDir(unpackDroidBench) }
 
 tasks.named<Test>("test") {
-  if (JavaVersion.current() == JavaVersion.VERSION_21) {
-    // Disable the task for JDK 21 for now.  We have test failures due to a required r8 upgrade
-    // that introduces some new behaviors we don't expect
-    // See https://github.com/wala/WALA/issues/1349
-    // enabled = false
-  }
   maxHeapSize = "800M"
 
   outputs.files(
diff --git a/dalvik/src/test/java/com/ibm/wala/dalvik/test/callGraph/JVMLDalvikComparisonTest.java b/dalvik/src/test/java/com/ibm/wala/dalvik/test/callGraph/JVMLDalvikComparisonTest.java
index fcf86c6142..b86aac42d7 100644
--- a/dalvik/src/test/java/com/ibm/wala/dalvik/test/callGraph/JVMLDalvikComparisonTest.java
+++ b/dalvik/src/test/java/com/ibm/wala/dalvik/test/callGraph/JVMLDalvikComparisonTest.java
@@ -107,7 +107,6 @@ private static void test(String mainClass, String javaScopeFile, boolean allowEx
     AnalysisScope javaScope = java.fst.getClassHierarchy().getScope();
     String javaJarPath = getJavaJar(javaScope);
     File androidDex = convertJarToDex(javaJarPath);
-    System.err.println(androidDex.getAbsolutePath());
     Pair<CallGraph, PointerAnalysis<InstanceKey>> android =
         makeDalvikCallGraph(null, null, mainClass, androidDex.getAbsolutePath());
 
@@ -178,7 +177,6 @@ private static void checkSourceLines(CallGraph java, CallGraph android) {
         : "inconsistent debug info: " + ajlines + " " + aalines;
   }
 
-  @SuppressWarnings("UnusedVariable")
   private static boolean checkEdgeDiff(
       Pair<CallGraph, PointerAnalysis<InstanceKey>> firstResult,
       Set<MethodReference> methodsInFirst,
@@ -205,25 +203,6 @@ private static boolean checkEdgeDiff(
           System.err.println("### " + n.getIR());
         }
       }
-
-      //      for (CGNode n : firstResult.fst) {
-      //        System.err.println("### " + n);
-      //        if (n.getIR() != null) {
-      //          System.err.println(n.getIR());
-
-      //          System.err.println("return: " + android.snd.getPointsToSet(new
-      // ReturnValueKey(n)));
-      //          System.err.println(
-      //              "exceptions: " + android.snd.getPointsToSet(new ExceptionReturnValueKey(n)));
-      //          for (int i = 1; i < n.getIR().getSymbolTable().getMaxValueNumber(); i++) {
-      //            LocalPointerKey x = new LocalPointerKey(n, i);
-      //            OrdinalSet<InstanceKey> s = android.snd.getPointsToSet(x);
-      //            if (s != null && !s.isEmpty()) {
-      //              System.err.println(i + ": " + s);
-      //            }
-      //          }
-      //        }
-      //      }
     }
     return fail;
   }