diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 9d7aed7d8..56cab33e3 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -481,6 +481,12 @@ See test_defs.xsd for more information.
     description="Android STL."
     extra_build_args="ASTL_TESTS=1" />
 
+<!-- Android Keystore tests -->
+<test-native name="netkeystore_test"
+    build_path="frameworks/base/cmds/keystore/tests"
+    description="Android keystore."
+    extra_build_args="KEYSTORE_TESTS=1" />
+
 <!-- pending patch 820
 <test-native name="gtest"
     build_path="external/gtest"
diff --git a/testrunner/test_defs/native_test.py b/testrunner/test_defs/native_test.py
index 1541cc1ec..d250de2b2 100644
--- a/testrunner/test_defs/native_test.py
+++ b/testrunner/test_defs/native_test.py
@@ -125,7 +125,7 @@ class NativeTestSuite(AbstractTestSuite):
     """
     for f in files:
       (name, ext) = os.path.splitext(f)
-      if ext == ".cc" or ext == ".cpp":
+      if ext == ".cc" or ext == ".cpp" or ext == ".c":
         if re.search("_test$|_test_$|_unittest$|_unittest_$|^test_", name):
           logger.SilentLog("Found %s" % f)
           test_list.append(str(os.path.join(dirname, f)))