diff --git a/grpc/tests/message_builder_test.cpp b/grpc/tests/message_builder_test.cpp
index d5ed8d975..36f5bc2ed 100644
--- a/grpc/tests/message_builder_test.cpp
+++ b/grpc/tests/message_builder_test.cpp
@@ -3,6 +3,10 @@
 #include "test_assert.h"
 #include "test_builder.h"
 
+using MyGame::Example::Vec3;
+using MyGame::Example::CreateStat;
+using MyGame::Example::Any_NONE;
+
 bool verify(flatbuffers::grpc::Message<Monster> &msg, const std::string &expected_name, Color color) {
   const Monster *monster = msg.GetRoot();
   return (monster->name()->str() == expected_name) && (monster->color() == color);
diff --git a/tests/test_builder.h b/tests/test_builder.h
index fe8bea914..1e2fa0adb 100644
--- a/tests/test_builder.h
+++ b/tests/test_builder.h
@@ -7,7 +7,9 @@
 #include "flatbuffers/flatbuffers.h"
 #include "test_assert.h"
 
-using namespace MyGame::Example;
+using MyGame::Example::Color;
+using MyGame::Example::Monster;
+
 namespace flatbuffers {
 namespace grpc {
 class MessageBuilder;