diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 793d3aca..f8e17a7e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -73,3 +73,9 @@ FOREACH (source_file ${check_PROGRAMS})
         ENDIF ()
     ENDIF ()
 ENDFOREACH ()
+
+ADD_EXECUTABLE (
+    multi_file
+    multi_file1.cpp multi_file2.cpp
+)
+ADD_TEST (multi_file multi_file)
diff --git a/test/Makefile.am b/test/Makefile.am
index 215e66e2..3fbc5d98 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -23,6 +23,7 @@ check_PROGRAMS = \
 		msgpack_stream \
 		msgpack_vref \
 		msgpack_cpp11 \
+		multi_file \
 		reference_cpp11 \
 		reference \
 		limit \
@@ -88,6 +89,8 @@ raw_SOURCES = raw.cpp
 
 iterator_cpp11_SOURCES = iterator_cpp11.cpp
 
+multi_file_SOURCES = multi_file1.cpp multi_file2.cpp
+
 boost_fusion_SOURCES = boost_fusion.cpp
 
 boost_optional_SOURCES = boost_optional.cpp
diff --git a/test/multi_file1.cpp b/test/multi_file1.cpp
new file mode 100644
index 00000000..7b899031
--- /dev/null
+++ b/test/multi_file1.cpp
@@ -0,0 +1 @@
+#include <msgpack.hpp>
diff --git a/test/multi_file2.cpp b/test/multi_file2.cpp
new file mode 100644
index 00000000..25c3ee42
--- /dev/null
+++ b/test/multi_file2.cpp
@@ -0,0 +1,3 @@
+#include <msgpack.hpp>
+
+int main() {}