diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/afterFromFieldAssignment.java b/java/java-tests/testData/inspection/explicitArrayFilling/afterFromFieldAssignment.java
index 31cc6e44fa75..a2071e1254db 100644
--- a/java/java-tests/testData/inspection/explicitArrayFilling/afterFromFieldAssignment.java
+++ b/java/java-tests/testData/inspection/explicitArrayFilling/afterFromFieldAssignment.java
@@ -3,35 +3,14 @@ package pack;
 
 import java.util.Arrays;
 
-public class HashMap<K,V> {
-  static class Node<K,V> {
-    final int hash;
-    final K key;
-    V value;
-    Node<K,V> next;
+public class TableWrapper {
 
-    Node(int hash, K key, V value, Node<K,V> next) {
-      this.hash = hash;
-      this.key = key;
-      this.value = value;
-      this.next = next;
-    }
-
-  }
-
-  transient Node<K,V>[] table;
-
-  transient int size;
-
-  transient int modCount;
-}
+  int[] table;
 
   public void clear() {
-    Node<K,V>[] tab;
-    modCount++;
-    if ((tab = table) != null && size > 0) {
-      size = 0;
-        Arrays.fill(tab, null);
+    int[] tab;
+    if ((tab = table) != null && table.length > 0) {
+        Arrays.fill(tab, 0);
     }
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/explicitArrayFilling/beforeFromFieldAssignment.java b/java/java-tests/testData/inspection/explicitArrayFilling/beforeFromFieldAssignment.java
index 8007ae1d6aeb..07a49de124eb 100644
--- a/java/java-tests/testData/inspection/explicitArrayFilling/beforeFromFieldAssignment.java
+++ b/java/java-tests/testData/inspection/explicitArrayFilling/beforeFromFieldAssignment.java
@@ -1,36 +1,16 @@
 // "Replace loop with 'Arrays.fill()' method call" "true"
 package pack;
 
-public class HashMap<K,V> {
-  static class Node<K,V> {
-    final int hash;
-    final K key;
-    V value;
-    Node<K,V> next;
+public class TableWrapper {
 
-    Node(int hash, K key, V value, Node<K,V> next) {
-      this.hash = hash;
-      this.key = key;
-      this.value = value;
-      this.next = next;
-    }
-
-  }
-
-  transient Node<K,V>[] table;
-
-  transient int size;
-
-  transient int modCount;
-}
+  int[] table;
 
   public void clear() {
-    Node<K,V>[] tab;
-    modCount++;
-    if ((tab = table) != null && size > 0) {
-      size = 0;
-      for (<caret>int i = 0; i < tab.length; ++i)
-        tab[i] = null;
+    int[] tab;
+    if ((tab = table) != null && table.length > 0) {
+      for (int<caret> i = 0; i < tab.length; ++i) {
+        tab[i] = 0;
+      }
     }
   }
 }
\ No newline at end of file