diff --git a/test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol b/test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol
deleted file mode 100644
index c3cc74c29..000000000
--- a/test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-  uint32[] s;
-  constructor()
-  {
-    s.push();
-    s.push();
-  }
-  function f() external returns (uint)
-  {
-    (s[1], s) = (4, [0]);
-    s = [0];
-    s.push();
-    return s[1];
-    // used to return 4 via IR.
-  }
-}
-// ----
-// constructor()
-// gas irOptimized: 237351
-// gas legacy: 221315
-// gas legacyOptimized: 185247
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
new file mode 100644
index 000000000..999d49eaa
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
@@ -0,0 +1,22 @@
+contract C {
+    uint32[] s;
+    constructor()
+    {
+        s.push();
+        s.push();
+    }
+    function f() external returns (uint)
+    {
+        (s[1], s) = (4, [0]);
+        s = [0];
+        s.push();
+        return s[1];
+        // used to return 4 via IR.
+    }
+}
+// ----
+// constructor()
+// gas irOptimized: 237351
+// gas legacy: 221315
+// gas legacyOptimized: 185247
+// f() -> 0
diff --git a/test/libsolidity/semanticTests/array/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
similarity index 100%
rename from test/libsolidity/semanticTests/array/function_type_array_to_storage.sol
rename to test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol