diff --git a/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py b/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py
index 1a8c335..d5e6d9c 100644
--- a/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py
+++ b/client/site_tests/kernel_ConfigVerify/kernel_ConfigVerify.py
@@ -266,6 +266,9 @@
         # Locate and load the list of kernel config variables.
         self._config = self._load_configs()
 
+        # Adjust for kernel-version-specific changes
+        kernel_ver = os.uname()[2]
+
         # Run the static checks.
         map(self.has_builtin, self.IS_BUILTIN)
         map(self.has_module, self.IS_MODULE)
@@ -294,11 +297,18 @@
 
         # Security; marks data segments as RO/NX.
         if self._arch.startswith('arm'):
-            # TODO(kees): ARM kernel needs the module RO/NX logic added.
+            # On ARM RODATA is not a config option, it is hardcoded.
             self.is_missing('DEBUG_RODATA')
-            self.is_missing('DEBUG_SET_MODULE_RONX')
         else:
             self.has_builtin('DEBUG_RODATA')
+        # DEBUG_SET_MODULE_RONX exists on all x86 and on ARM in 3.4.
+        if self._arch.startswith('arm'):
+            if utils.compare_versions(kernel_ver, "3.4") >= 0 and \
+               utils.compare_versions(kernel_ver, "3.8") < 0:
+                self.has_builtin('DEBUG_SET_MODULE_RONX')
+            else:
+                self.is_missing('DEBUG_SET_MODULE_RONX')
+        else:
             self.has_builtin('DEBUG_SET_MODULE_RONX')
 
         # Kernel: make sure port 0xED is the one used for I/O delay