diff --git a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorNonDefaultConstructor.java b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorNonDefaultConstructor.java
index 76516eb0eb52..0cefc11c015d 100644
--- a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorNonDefaultConstructor.java
+++ b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorNonDefaultConstructor.java
@@ -18,7 +18,7 @@ private static class X implements Runnable {
 
         private byte a;
         private Map<String, Set<String>> map1;
-        private Map<String, Set<String>> map2 = new HashMap<>();
+        private Map<String, Set<String>> map2 = new HashMap();
 
         public X(byte a, Map<String, Set<String>> map1) {}
 
diff --git a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorTest.java b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorTest.java
index a1e1a1286c3b..73ff1d24b122 100644
--- a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorTest.java
+++ b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorTest.java
@@ -16,7 +16,7 @@ private static class X implements Runnable {
 
         private byte a;
         private Map<String, Set<String>> map1;
-        private Map<String, Set<String>> map2 = new HashMap<>();
+        private Map<String, Set<String>> map2 = new HashMap();
 
         public void run() {
         }
diff --git a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithConstructors.java b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithConstructors.java
index 31f120055d1b..e073838fb43b 100644
--- a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithConstructors.java
+++ b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithConstructors.java
@@ -19,7 +19,7 @@ private static class X implements Runnable {
 
         private byte a;
         private Map<String, Set<String>> map1;
-        private Map<String, Set<String>> map2 = new HashMap<>();
+        private Map<String, Set<String>> map2 = new HashMap();
 
         public X() {}
         public X(byte a, Map<String, Set<String>> map1) {}
diff --git a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithDefaultConstructor.java b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithDefaultConstructor.java
index f7b2c2925a64..9d44ea381974 100644
--- a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithDefaultConstructor.java
+++ b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithDefaultConstructor.java
@@ -18,7 +18,7 @@ private static class X implements Runnable {
 
         private byte a;
         private Map<String, Set<String>> map1;
-        private Map<String, Set<String>> map2 = new HashMap<>();
+        private Map<String, Set<String>> map2 = new HashMap();
 
         public X() {}
         
diff --git a/java/java.hints/test/unit/data/org/netbeans/test/java/hints/SuppressWarningsFixerTest/Test.java b/java/java.hints/test/unit/data/org/netbeans/test/java/hints/SuppressWarningsFixerTest/Test.java
index 6b7b450b56d9..b7fa4a6cb499 100644
--- a/java/java.hints/test/unit/data/org/netbeans/test/java/hints/SuppressWarningsFixerTest/Test.java
+++ b/java/java.hints/test/unit/data/org/netbeans/test/java/hints/SuppressWarningsFixerTest/Test.java
@@ -5,10 +5,10 @@
 
 public class Test {
     
-    private List<String> l = new ArrayList<>();
+    private List<String> l = new ArrayList();
     
     {
-        l = new ArrayList<>();
+        l = new ArrayList();
     }
     
     private void test1() {