diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
index cc9133cf684b..6d11cb5fe587 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
@@ -123,6 +123,7 @@
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
@@ -850,15 +851,12 @@ void testScmHandleJvmPause() throws Exception {
     }
   }
 
-  @Test
-  public void testProcessLayoutVersion() throws IOException {
-    // TODO: Refactor this class to use org.junit.jupiter so test
-    //  parameterization can be used.
-    for (FinalizationCheckpoint checkpoint: FinalizationCheckpoint.values()) {
-      LOG.info("Testing with SCM finalization checkpoint {}", checkpoint);
-      testProcessLayoutVersionLowerMlv(checkpoint);
-      testProcessLayoutVersionReportHigherMlv(checkpoint);
-    }
+  @ParameterizedTest
+  @EnumSource(FinalizationCheckpoint.class)
+  public void testProcessLayoutVersion(FinalizationCheckpoint checkpoint) throws IOException {
+    LOG.info("Testing with SCM finalization checkpoint {}", checkpoint);
+    testProcessLayoutVersionLowerMlv(checkpoint);
+    testProcessLayoutVersionReportHigherMlv(checkpoint);
   }
 
   // Currently invoked by testProcessLayoutVersion.