diff --git a/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py b/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py
index 171ec13..2ca7247 100644
--- a/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py
+++ b/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py
@@ -299,19 +299,16 @@
             else:
                 self.has_builtin('X86_64')
 
-        # Security; marks data segments as RO/NX.
-        if self._arch.startswith('arm'):
-            # On ARM RODATA is not a config option, it is hardcoded.
-            self.is_missing('DEBUG_RODATA')
-        else:
-            self.has_builtin('DEBUG_RODATA')
-        # DEBUG_SET_MODULE_RONX exists on all x86 and on ARM in 3.8+.
+        # Security; marks data segments as RO/NX, text as RO.
         if self._arch.startswith('arm'):
             if utils.compare_versions(kernel_ver, "3.8") >= 0:
+                self.has_builtin('DEBUG_RODATA')
                 self.has_builtin('DEBUG_SET_MODULE_RONX')
             else:
+                self.is_missing('DEBUG_RODATA')
                 self.is_missing('DEBUG_SET_MODULE_RONX')
         else:
+            self.has_builtin('DEBUG_RODATA')
             self.has_builtin('DEBUG_SET_MODULE_RONX')
 
         # Kernel: make sure port 0xED is the one used for I/O delay