diff --git a/ipmi/dcmi/test_dcmi_get_capabilities.robot b/ipmi/dcmi/test_dcmi_get_capabilities.robot
new file mode 100644
index 0000000..092d579
--- /dev/null
+++ b/ipmi/dcmi/test_dcmi_get_capabilities.robot
@@ -0,0 +1,35 @@
+*** Settings ***
+
+Documentation    Module to test dcmi get capabilites functionality.
+Resource         ../../lib/ipmi_client.robot
+
+*** Test Cases ***
+
+Verify Get DCMI Capabilities
+    [Documentation]  Verify get DCMI capabilities command output.
+    [Tags]  Verify_Get_DCMI_Capabilities
+    ${cmd_output}=  Run IPMI Standard Command  dcmi discover
+
+    @{supported_capabilities}=  Create List
+    # Supported DCMI capabilities:
+    ...  Mandatory platform capabilties
+    ...  Optional platform capabilties
+    ...  Power management available
+    ...  Managebility access capabilties
+    ...  In-band KCS channel available
+    # Mandatory platform attributes:
+    ...  200 SEL entries
+    ...  SEL automatic rollover is enabled
+    # Optional Platform Attributes:
+    ...  Slave address of device: 0h (8bits)(Satellite/External controller)
+    ...  Channel number is 0h (Primary BMC)
+    ...  Device revision is 0
+    # Manageability Access Attributes:
+    ...  Primary LAN channel number: 1 is available
+    ...  Secondary LAN channel is not available for OOB
+    ...  No serial channel is available
+
+    FOR  ${capability}  IN  @{supported_capabilities}
+      Run Keyword And Continue On Failure  Should Contain  ${cmd_output}  ${capability}  ignore_case=True
+      ...  msg=Supported DCMI capabilities not present.
+    END
diff --git a/ipmi/test_ipmi_general.robot b/ipmi/test_ipmi_general.robot
index 313eb79..924147a 100644
--- a/ipmi/test_ipmi_general.robot
+++ b/ipmi/test_ipmi_general.robot
@@ -14,36 +14,6 @@
 
 *** Test Cases ***
 
-Verify Get DCMI Capabilities
-    [Documentation]  Verify get DCMI capabilities command output.
-    [Tags]  Verify_Get_DCMI_Capabilities
-    ${cmd_output}=  Run IPMI Standard Command  dcmi discover
-
-    @{supported_capabilities}=  Create List
-    # Supported DCMI capabilities:
-    ...  Mandatory platform capabilties
-    ...  Optional platform capabilties
-    ...  Power management available
-    ...  Managebility access capabilties
-    ...  In-band KCS channel available
-    # Mandatory platform attributes:
-    ...  200 SEL entries
-    ...  SEL automatic rollover is enabled
-    # Optional Platform Attributes:
-    ...  Slave address of device: 0h (8bits)(Satellite/External controller)
-    ...  Channel number is 0h (Primary BMC)
-    ...  Device revision is 0
-    # Manageability Access Attributes:
-    ...  Primary LAN channel number: 1 is available
-    ...  Secondary LAN channel is not available for OOB
-    ...  No serial channel is available
-
-    FOR  ${capability}  IN  @{supported_capabilities}
-      Should Contain  ${cmd_output}  ${capability}  ignore_case=True
-      ...  msg=Supported DCMI capabilities not present.
-    END
-
-
 Test Get Self Test Results via IPMI Raw Command
     [Documentation]  Get self test results via IPMI raw command and verify the output.
     [Tags]  Test_Get_Self_Test_Results_via_IPMI_Raw_Command