diff --git a/core-java-modules/core-java-arrays-operations-advanced-2/src/test/java/com/baeldung/matrixtozero/SetMatrixToZeroUnitTest.java b/core-java-modules/core-java-arrays-operations-advanced-2/src/test/java/com/baeldung/matrixtozero/SetMatrixToZeroUnitTest.java
new file mode 100644
index 0000000000..e144c90ba7
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-advanced-2/src/test/java/com/baeldung/matrixtozero/SetMatrixToZeroUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.matrixtozero;
+
+import org.junit.Test;
+
+public class SetMatrixToZeroUnitTest{
+    @Test 
+    void givenMatrix_whenUsingBruteForce_thenSetZeroes() {
+        int[][] matrix = {
+                {1, 2, 3},
+                {4, 0, 6},
+                {7, 8, 9}
+        };
+        int[][] expected = {
+                {1, 0, 3},
+                {0, 0, 0},
+                {7, 0, 9}
+        };
+        SetMatrixToZero.setZeroesBruteForce(matrix);
+        assertArrayEquals(expected, matrix);
+    }
+
+    @Test
+    void givenMatrix_whenUsingExtraSpace_thenSetZeroes() {
+        int[][] matrix = {
+                {1, 2, 3},
+                {4, 0, 6},
+                {7, 8, 9}
+        };
+        int[][] expected = {
+                {1, 0, 3},
+                {0, 0, 0},
+                {7, 0, 9}
+        };
+        SetMatrixToZero.setZeroesExtraSpace(matrix);
+        assertArrayEquals(expected, matrix);
+    }
+
+    @Test
+    void givenMatrix_whenUsingOptimized_thenSetZeroes() {
+        int[][] matrix = {
+                {1, 2, 3},
+                {4, 0, 6},
+                {7, 8, 9}
+        };
+        int[][] expected = {
+                {1, 0, 3},
+                {0, 0, 0},
+                {7, 0, 9}
+        };
+        SetMatrixToZero.setZeroesOptimized(matrix);
+        assertArrayEquals(expected, matrix);
+    }
+}