diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged.log b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged.log
index 7437ac4a0841..730c23d6a2e9 100644
--- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged.log
+++ b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged.log
@@ -5,4 +5,4 @@ End of files
 Compiling files:
 src/A1.java
 src/C1.java
-End of files
+End of files
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleB/src/module-info.java b/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleB/src/module-info.java
index 33f12a89b194..af9147c10519 100644
--- a/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleB/src/module-info.java
+++ b/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleB/src/module-info.java
@@ -1,3 +1,4 @@
 module B {
+  exports qqq;
   requires A;
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleB/src/module-info.java.new b/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleB/src/module-info.java.new
index 2fab91b37842..a3748361c821 100644
--- a/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleB/src/module-info.java.new
+++ b/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleB/src/module-info.java.new
@@ -1,2 +1,3 @@
 module B {
+  exports qqq;
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleC/qqq2/ClientC.java b/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleC/qqq2/ClientC.java
index 4d7a30b6aa07..76c5190b1be4 100644
--- a/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleC/qqq2/ClientC.java
+++ b/java/java-tests/testData/compileServer/incremental/java9-features/removeModuleRequires/moduleC/qqq2/ClientC.java
@@ -2,7 +2,7 @@ package qqq2;
 
 import qqq.Client;
 
-public class Client {
+public class ClientC {
   public void perform() {
     new Client().perform();
   }
diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceAbstractMethod/Service.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceAbstractMethod/Service.java.new
deleted file mode 100644
index 7f5b0a10fa2c..000000000000
--- a/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceAbstractMethod/Service.java.new
+++ /dev/null
@@ -1,4 +0,0 @@
-interface Service {
-  void foo();
-  void bar(int a);
-}
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceAbstractMethod/src/Service.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceAbstractMethod/src/Service.java.new
index 7caa2fe10695..e5e6ab1759cf 100644
--- a/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceAbstractMethod/src/Service.java.new
+++ b/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceAbstractMethod/src/Service.java.new
@@ -1,5 +1,4 @@
 interface Service {
   void foo();
-  
   void bar();
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceMethod/Service.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceMethod/Service.java.new
deleted file mode 100644
index 7f5b0a10fa2c..000000000000
--- a/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceMethod/Service.java.new
+++ /dev/null
@@ -1,4 +0,0 @@
-interface Service {
-  void foo();
-  void bar(int a);
-}
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceMethod/src/Service.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceMethod/src/Service.java.new
index 03cf49b831dc..28ca0ae09f78 100644
--- a/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceMethod/src/Service.java.new
+++ b/java/java-tests/testData/compileServer/incremental/membersChange/addSAMInterfaceMethod/src/Service.java.new
@@ -1,5 +1,4 @@
 interface Service {
   void foo();
-  
-  default void bar() {}
+  default void bar(int a) {}
 }
\ No newline at end of file