diff --git a/test_conformance/api/CMakeLists.txt b/test_conformance/api/CMakeLists.txt
index d3213ed5..9bd6c6e4 100644
--- a/test_conformance/api/CMakeLists.txt
+++ b/test_conformance/api/CMakeLists.txt
@@ -33,6 +33,7 @@ set(${MODULE_NAME}_SOURCES
          test_context_destructor_callback.cpp
          test_mem_object_properties_queries.cpp
          test_queue_properties_queries.cpp
+         test_pipe_properties_queries.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/api/main.cpp b/test_conformance/api/main.cpp
index 9740cba4..e41249a7 100644
--- a/test_conformance/api/main.cpp
+++ b/test_conformance/api/main.cpp
@@ -127,6 +127,7 @@ test_definition test_list[] = {
     ADD_TEST_VERSION(buffer_properties_queries, Version(3, 0)),
     ADD_TEST_VERSION(image_properties_queries, Version(3, 0)),
     ADD_TEST_VERSION(queue_properties_queries, Version(3, 0)),
+    ADD_TEST_VERSION(pipe_properties_queries, Version(3, 0)),
 
     ADD_TEST_VERSION(consistency_svm, Version(3, 0)),
     ADD_TEST_VERSION(consistency_memory_model, Version(3, 0)),
diff --git a/test_conformance/api/procs.h b/test_conformance/api/procs.h
index c550e5cc..5d91c73f 100644
--- a/test_conformance/api/procs.h
+++ b/test_conformance/api/procs.h
@@ -137,6 +137,8 @@ extern int test_queue_properties_queries(cl_device_id deviceID,
                                          cl_context context,
                                          cl_command_queue queue,
                                          int num_elements);
+int test_pipe_properties_queries(cl_device_id deviceID, cl_context context,
+                                 cl_command_queue queue, int num_elements);
 
 extern int test_consistency_svm(cl_device_id deviceID, cl_context context,
                                 cl_command_queue queue, int num_elements);
diff --git a/test_conformance/api/test_pipe_properties_queries.cpp b/test_conformance/api/test_pipe_properties_queries.cpp
new file mode 100644
index 00000000..db918952
--- /dev/null
+++ b/test_conformance/api/test_pipe_properties_queries.cpp
@@ -0,0 +1,100 @@
+//
+// Copyright (c) 2020 The Khronos Group Inc.
+//
+// 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 "testBase.h"
+#include "harness/typeWrappers.h"
+
+#include <vector>
+
+struct test_query_pipe_properties_data
+{
+    std::vector<cl_pipe_properties> properties;
+    std::string description;
+};
+
+static int create_pipe_and_check_array_properties(
+    cl_context context, const test_query_pipe_properties_data& test_case)
+{
+    log_info("TC description: %s\n", test_case.description.c_str());
+
+    cl_int error = CL_SUCCESS;
+
+    clMemWrapper test_pipe;
+
+    if (test_case.properties.size() > 0)
+    {
+        test_pipe = clCreatePipe(context, CL_MEM_HOST_NO_ACCESS, 4, 4,
+                                 test_case.properties.data(), &error);
+        test_error(error, "clCreatePipe failed");
+    }
+    else
+    {
+        test_pipe =
+            clCreatePipe(context, CL_MEM_HOST_NO_ACCESS, 4, 4, NULL, &error);
+        test_error(error, "clCreatePipe failed");
+    }
+
+    std::vector<cl_pipe_properties> check_properties;
+    size_t set_size = 0;
+
+    error = clGetPipeInfo(test_pipe, CL_PIPE_PROPERTIES, 0, NULL, &set_size);
+    test_error(error,
+               "clGetPipeInfo failed asking for "
+               "CL_PIPE_PROPERTIES size.");
+
+    if (set_size == 0 && test_case.properties.size() == 0)
+    {
+        return TEST_PASS;
+    }
+    if (set_size != test_case.properties.size() * sizeof(cl_pipe_properties))
+    {
+        log_error("ERROR: CL_PIPE_PROPERTIES size is %d, expected %d.\n",
+                  set_size,
+                  test_case.properties.size() * sizeof(cl_pipe_properties));
+        return TEST_FAIL;
+    }
+
+    log_error("Unexpected test case size.  This test needs to be updated to "
+              "compare pipe properties.\n");
+    return TEST_FAIL;
+}
+
+int test_pipe_properties_queries(cl_device_id deviceID, cl_context context,
+                                 cl_command_queue queue, int num_elements)
+{
+    cl_int error = CL_SUCCESS;
+
+    cl_bool pipeSupport = CL_FALSE;
+    error = clGetDeviceInfo(deviceID, CL_DEVICE_PIPE_SUPPORT,
+                            sizeof(pipeSupport), &pipeSupport, NULL);
+    test_error(error, "Unable to query CL_DEVICE_PIPE_SUPPORT");
+
+    if (pipeSupport == CL_FALSE)
+    {
+        return TEST_SKIPPED_ITSELF;
+    }
+
+    int result = TEST_PASS;
+
+    std::vector<test_query_pipe_properties_data> test_cases;
+    test_cases.push_back({ {}, "NULL properties" });
+
+    for (auto test_case : test_cases)
+    {
+        result |= create_pipe_and_check_array_properties(context, test_case);
+    }
+
+    return result;
+}