diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2ad3ab75..1eddfd26 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -29,13 +29,13 @@ LIST (APPEND check_PROGRAMS
     msgpack_c.cpp
     reference.cpp
     limit.cpp
-    iterator.cpp
 )
 
 IF (MSGPACK_CXX11)
     LIST (APPEND check_PROGRAMS
         msgpack_cpp11.cpp
         reference_cpp11.cpp
+        iterator_cpp11.cpp
     )
 ENDIF ()
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 44e2c852..b5a5e2ed 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -26,7 +26,7 @@ check_PROGRAMS = \
 		reference_cpp11 \
 		reference \
 		limit \
-		iterator
+		iterator_cpp11
 
 TESTS = $(check_PROGRAMS)
 
@@ -77,6 +77,6 @@ reference_cpp11_SOURCES = reference_cpp11.cpp
 
 limit_SOURCES = limit.cpp
 
-iterator_SOURCES = iterator.cpp
+iterator_cpp11_SOURCES = iterator_cpp11.cpp
 
 EXTRA_DIST = cases.mpac cases_compact.mpac
diff --git a/test/iterator.cpp b/test/iterator_cpp11.cpp
similarity index 100%
rename from test/iterator.cpp
rename to test/iterator_cpp11.cpp