diff --git a/tests/regex_test.cpp b/tests/regex_test.cpp
new file mode 100644
index 0000000..659d1db
--- /dev/null
+++ b/tests/regex_test.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include <sys/types.h>
+#include <regex.h>
+
+TEST(regex, smoke) {
+  // A quick test of all the regex functions.
+  regex_t re;
+  ASSERT_EQ(0, regcomp(&re, "ab*c", 0));
+  ASSERT_EQ(0, regexec(&re, "abbbc", 0, NULL, 0));
+  ASSERT_EQ(REG_NOMATCH, regexec(&re, "foo", 0, NULL, 0));
+
+  char buf[80];
+  regerror(REG_NOMATCH, &re, buf, sizeof(buf));
+#if __BIONIC__
+  ASSERT_STREQ("regexec() failed to match", buf);
+#else
+  ASSERT_STREQ("No match", buf);
+#endif
+
+  regfree(&re);
+}