diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_arithmetic.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_arithmetic.test.cpp
index d250c8c305b2..ba3678e443e9 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_arithmetic.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_arithmetic.test.cpp
@@ -10,8 +10,7 @@
 #include <string>
 #include <vector>
 
-using namespace bb;
-
+using namespace avm_trac;
 class AvmMiniArithmeticTests : public ::testing::Test {
   public:
     AvmMiniTraceBuilder trace_builder;
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_control_flow.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_control_flow.test.cpp
index a050ddd5d648..c44ade71385b 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_control_flow.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_control_flow.test.cpp
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-using namespace bb;
+using namespace avm_trace;
 
 class AvmMiniControlFlowTests : public ::testing::Test {
   public:
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_memory.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_memory.test.cpp
index 68d9560da075..e42f92931f23 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_memory.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_memory.test.cpp
@@ -11,7 +11,6 @@
 #include <vector>
 
 using namespace avm_trace;
-
 class AvmMiniMemoryTests : public ::testing::Test {
   public:
     AvmMiniTraceBuilder trace_builder;
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
index 3a38e6fbc839..111e4480f9a2 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
@@ -5,6 +5,8 @@
 #include "barretenberg/vm/generated/AvmMini_verifier.hpp"
 #include <gtest/gtest.h>
 
+using namespace bb;
+
 namespace avm_trace {
 /**
  * @brief Helper routine proving and verifying a proof based on the supplied trace