diff --git a/data/pldm_variables.py b/data/pldm_variables.py
index d836b4d..9cda77a 100755
--- a/data/pldm_variables.py
+++ b/data/pldm_variables.py
@@ -164,14 +164,6 @@
     'possiblestatessize': ['1', '2'],
     'possiblestates': ['6', '0']}
 
-RESPONSE_DICT_GETFRURECORDTABLEMETADATA = {
-    'frudatamajorversion': ['1'],
-    'frudataminorversion': ['0'],
-    'frutablemaximumsize': ['4294967295'],
-    'frutablelength': ['60'],
-    'total_number_of_record_set_identifiers_in_table': ['1'],
-    'total_number_of_records_in_table': ['1']}
-
 RESPONSE_DICT_GETBIOSTABLE_STRTABLE = {
     'biosstringhandle': ['BIOSString'],
     '0': ['Allowed'],
diff --git a/pldm/test_pldm_fru.robot b/pldm/test_pldm_fru.robot
index 2367857..2c747d9 100644
--- a/pldm/test_pldm_fru.robot
+++ b/pldm/test_pldm_fru.robot
@@ -16,13 +16,19 @@
     [Tags]  Verify_GetFruRecordTableMetadata
 
     # pldm_output:
-    # [frutablelength]:                                   60
     # [frudatamajorversion]:                              1
-    # [total_number_of_record_set_identifiers_in_table]:  1
     # [frudataminorversion]:                              0
-    # [total_number_of_records_in_table]:                 1
     # [frutablemaximumsize]:                              4294967295
+    # [frutablelength]:                                   60
+    # [total_number_of_record_set_identifiers_in_table]:  1
+    # [total_number_of_records_in_table]:                 1
 
     ${pldm_output}=  Pldmtool  fru GetFruRecordTableMetadata
     Rprint Vars  pldm_output
-    Valid Dict  pldm_output  valid_values=${RESPONSE_DICT_GETFRURECORDTABLEMETADATA}
+
+    Valid Value  pldm_output['frudatamajorversion']  ['1']
+    Valid Value  pldm_output['frudataminorversion']  ['0']
+    Valid Value  pldm_output['frutablemaximumsize']  ['4294967295']
+    Valid Range  ${pldm_output['frutablelength']}  1
+    Valid Range  ${pldm_output['total_number_of_records_in_table']}  1
+    Valid Range  ${pldm_output['total_number_of_record_set_identifiers_in_table']}  1