diff --git a/stream-servers/tests/GLSnapshotBuffers_unittest.cpp b/stream-servers/tests/GLSnapshotBuffers_unittest.cpp
index d246d90..2dc4318 100644
--- a/stream-servers/tests/GLSnapshotBuffers_unittest.cpp
+++ b/stream-servers/tests/GLSnapshotBuffers_unittest.cpp
@@ -20,7 +20,9 @@
 
 #include <map>
 
-namespace emugl {
+namespace gfxstream {
+namespace gl {
+namespace {
 
 static const GLenum kGLES2GlobalBufferBindings[] = {
         GL_ARRAY_BUFFER_BINDING, GL_ELEMENT_ARRAY_BUFFER_BINDING};
@@ -143,4 +145,6 @@
     doCheckedSnapshot();
 }
 
-}  // namespace emugl
+}  // namespace
+}  // namespace gl
+}  // namespace gfxstream