diff --git a/configstore/1.0/vts/functional/Android.bp b/configstore/1.0/vts/functional/Android.bp
new file mode 100644
index 0000000..1775538
--- /dev/null
+++ b/configstore/1.0/vts/functional/Android.bp
@@ -0,0 +1,34 @@
+//
+// Copyright (C) 2017 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.
+//
+
+cc_test {
+    name: "VtsHalConfigstoreV1_0TargetTest",
+    defaults: ["hidl_defaults"],
+    srcs: ["VtsHalConfigstoreV1_0TargetTest.cpp"],
+    shared_libs: [
+        "libbase",
+        "libhidlbase",
+        "liblog",
+        "libutils",
+        "android.hardware.configstore@1.0",
+    ],
+    static_libs: ["VtsHalHidlTargetTestBase"],
+    cflags: [
+        "-O0",
+        "-g",
+    ]
+}
+
diff --git a/configstore/1.0/vts/functional/VtsHalConfigstoreV1_0TargetTest.cpp b/configstore/1.0/vts/functional/VtsHalConfigstoreV1_0TargetTest.cpp
new file mode 100644
index 0000000..95cd30b
--- /dev/null
+++ b/configstore/1.0/vts/functional/VtsHalConfigstoreV1_0TargetTest.cpp
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#define LOG_TAG "ConfigstoreHidlHalTest"
+
+#include <VtsHalHidlTargetTestBase.h>
+#include <android-base/logging.h>
+#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>
+#include <android/hardware/configstore/1.0/types.h>
+#include <unistd.h>
+
+using ::android::hardware::configstore::V1_0::ISurfaceFlingerConfigs;
+using ::android::hardware::configstore::V1_0::OptionalBool;
+using ::android::hardware::configstore::V1_0::OptionalInt64;
+using ::android::hardware::configstore::V1_0::OptionalUInt64;
+using ::android::hardware::hidl_vec;
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+using ::android::sp;
+
+#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
+#define EXPECT_OK(ret) EXPECT_TRUE(ret.isOk())
+
+class ConfigstoreHidlTest : public ::testing::VtsHalHidlTargetTestBase {
+   public:
+    sp<ISurfaceFlingerConfigs> sfConfigs;
+
+    virtual void SetUp() override {
+        sfConfigs = ::testing::VtsHalHidlTargetTestBase::getService<
+            ISurfaceFlingerConfigs>();
+    }
+
+    virtual void TearDown() override {}
+};
+
+/**
+ * Ensure all ISurfaceFlingerConfigs.hal function calls are successful.
+ */
+TEST_F(ConfigstoreHidlTest, TestFunctionCalls) {
+    bool tmp;
+
+    Return<void> status = sfConfigs->vsyncEventPhaseOffsetNs(
+        [&tmp](OptionalInt64 arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->vsyncSfEventPhaseOffsetNs(
+        [&tmp](OptionalInt64 arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->useContextPriority(
+        [&tmp](OptionalBool arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->hasWideColorDisplay(
+        [&tmp](OptionalBool arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->hasHDRDisplay(
+        [&tmp](OptionalBool arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->presentTimeOffsetFromVSyncNs(
+        [&tmp](OptionalInt64 arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->useHwcForRGBtoYUV(
+        [&tmp](OptionalBool arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->maxVirtualDisplaySize(
+        [&tmp](OptionalUInt64 arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->hasSyncFramework(
+        [&tmp](OptionalBool arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->useVrFlinger(
+        [&tmp](OptionalBool arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->maxFrameBufferAcquiredBuffers(
+        [&tmp](OptionalInt64 arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+
+    status = sfConfigs->startGraphicsAllocatorService(
+        [&tmp](OptionalBool arg) { tmp = arg.specified; });
+    EXPECT_OK(status);
+}
+
+/**
+ * Ensure repeated call to the same function returns the same result.
+ */
+TEST_F(ConfigstoreHidlTest, TestSameReturnValue) {
+    int64_t original_ret;
+    Return<void> status = sfConfigs->vsyncEventPhaseOffsetNs(
+        [&original_ret](OptionalInt64 arg) { original_ret = arg.value; });
+
+    int64_t next_ret;
+    for (int cnt = 0; cnt < 10; cnt++) {
+        status = sfConfigs->vsyncEventPhaseOffsetNs(
+            [&next_ret](OptionalInt64 arg) { next_ret = arg.value; });
+        EXPECT_EQ(original_ret, next_ret);
+    }
+}
+
+int main(int argc, char** argv) {
+    ::testing::InitGoogleTest(&argc, argv);
+    int status = RUN_ALL_TESTS();
+    LOG(INFO) << "Test result = " << status;
+    return status;
+}
diff --git a/configstore/Android.bp b/configstore/Android.bp
index 79b63f6..ba3e62e 100644
--- a/configstore/Android.bp
+++ b/configstore/Android.bp
@@ -1,5 +1,6 @@
 // This is an autogenerated file, do not edit.
 subdirs = [
     "1.0",
+    "1.0/vts/functional",
     "utils",
 ]