diff --git a/test/DebugProtoTest.thrift b/test/DebugProtoTest.thrift
index bbd86df..090418c 100644
--- a/test/DebugProtoTest.thrift
+++ b/test/DebugProtoTest.thrift
@@ -63,3 +63,13 @@
 service Srv {
   i32 Janky(i32 arg)
 }
+
+service PartiallyReflectable {
+  map<i32,map<i32,i32>> returnNotReflectable(1: i32 hello),
+  void argNotReflectable(1: list<set<i32>> arg),
+  void arg2NotReflectable(1: i32 arg1, 2: list<set<i32>> argNotReflectable),
+  void withMap(1: map<i32, string> amap),
+
+  OneOfEach refl1(1: list<Bonk> arg1),
+  OneOfEach refl2(2: list<string> arg1, 1: Bonk arg2);
+}
diff --git a/test/ReflectionTest.cpp b/test/ReflectionTest.cpp
new file mode 100644
index 0000000..614c613
--- /dev/null
+++ b/test/ReflectionTest.cpp
@@ -0,0 +1,30 @@
+/*
+../compiler/cpp/thrift -cpp DebugProtoTest.thrift
+../compiler/cpp/thrift -cpp StressTest.thrift
+g++ -Wall -I../lib/cpp/src -I/usr/local/include/boost-1_33_1 \
+  ReflectionTest.cpp \
+  gen-cpp/StressTest_types.cpp gen-cpp/DebugProtoTest_types.cpp \
+  gen-cpp/Service.cpp gen-cpp/PartiallyReflectable.cpp \
+  ../lib/cpp/.libs/libthrift.a -o ReflectionTest
+./ReflectionTest
+*/
+
+#include <iostream>
+#include "gen-cpp/PartiallyReflectable.h"
+#include "gen-cpp/Service.h"
+#include "../lib/cpp/src/protocol/TDebugProtocol.h"
+
+int main() {
+  using std::cout;
+  using std::endl;
+
+  facebook::thrift::reflection::limited::Service srv1;
+  thrift::test::PartiallyReflectableIf::getStaticLimitedReflection(srv1);
+  cout << facebook::thrift::ThriftDebugString(srv1) << endl << endl;
+
+  facebook::thrift::reflection::limited::Service srv2;
+  test::stress::ServiceIf::getStaticLimitedReflection(srv2);
+  cout << facebook::thrift::ThriftDebugString(srv2) << endl << endl;
+
+  return 0;
+}