diff --git a/test/Makefile b/test/Makefile
index ff9a850d8..af795a633 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 # These directories contain tests.
-TESTDIRS = lib
+TESTDIRS = cpp_headers lib
 
 DIRS-y = $(TESTDIRS)
 
diff --git a/test/cpp_headers/Makefile b/test/cpp_headers/Makefile
new file mode 100644
index 000000000..d27d26927
--- /dev/null
+++ b/test/cpp_headers/Makefile
@@ -0,0 +1,44 @@
+#
+#  BSD LICENSE
+#
+#  Copyright (c) Intel Corporation.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions
+#  are met:
+#
+#    * Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright
+#      notice, this list of conditions and the following disclaimer in
+#      the documentation and/or other materials provided with the
+#      distribution.
+#    * Neither the name of Intel Corporation nor the names of its
+#      contributors may be used to endorse or promote products derived
+#      from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+
+CXX_SRCS := cpp_headers.cpp
+
+all : cpp_headers.o
+
+clean :
+	$(CLEAN_C)
+
+include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
diff --git a/test/cpp_headers/cpp_headers.cpp b/test/cpp_headers/cpp_headers.cpp
new file mode 100644
index 000000000..4893dd1b1
--- /dev/null
+++ b/test/cpp_headers/cpp_headers.cpp
@@ -0,0 +1,36 @@
+// Make sure all of the SPDK public headers compile as C++
+
+extern "C" {
+#include "spdk/assert.h"
+#include "spdk/barrier.h"
+#include "spdk/bdev.h"
+#include "spdk/bit_array.h"
+#include "spdk/conf.h"
+#include "spdk/copy_engine.h"
+#include "spdk/endian.h"
+#include "spdk/event.h"
+#include "spdk/fd.h"
+#include "spdk/gpt_spec.h"
+#include "spdk/ioat.h"
+#include "spdk/ioat_spec.h"
+#include "spdk/iscsi_spec.h"
+#include "spdk/json.h"
+#include "spdk/jsonrpc.h"
+#include "spdk/likely.h"
+#include "spdk/log.h"
+#include "spdk/mmio.h"
+#include "spdk/net.h"
+#include "spdk/nvme.h"
+#include "spdk/nvme_intel.h"
+#include "spdk/nvme_spec.h"
+#include "spdk/nvmf_spec.h"
+#include "spdk/pci.h"
+#include "spdk/pci_ids.h"
+#include "spdk/queue.h"
+#include "spdk/rpc.h"
+#include "spdk/scsi.h"
+#include "spdk/scsi_spec.h"
+#include "spdk/string.h"
+#include "spdk/trace.h"
+#include "spdk/vtophys.h"
+}