diff --git a/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp b/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
index 430f6d0844..1fd70cb88c 100644
--- a/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
+++ b/Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp
@@ -11,6 +11,7 @@
 #include <AzCore/base.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Debug/TraceMessageBus.h>
+#include <AzCore/UnitTest/TestTypes.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 
 #include <AzToolsFramework/Application/ToolsApplication.h>
@@ -22,7 +23,7 @@ namespace DisplaySettingsPythonBindingsUnitTests
 {
 
     class DisplaySettingsPythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::ScopedAllocatorSetupFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;
@@ -51,7 +52,7 @@ namespace DisplaySettingsPythonBindingsUnitTests
     }
 
     class DisplaySettingsComponentFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::ScopedAllocatorSetupFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;
diff --git a/Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp b/Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
index 60c61c6c56..047cea3aad 100644
--- a/Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
+++ b/Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp
@@ -11,6 +11,7 @@
 #include <AzCore/base.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Debug/TraceMessageBus.h>
+#include <AzCore/UnitTest/TestTypes.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 
@@ -22,7 +23,7 @@ namespace ViewPaneFuncsUnitTests
 {
 
     class ViewPanePythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::ScopedAllocatorSetupFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;
diff --git a/Code/Framework/AzFramework/Tests/Platform/Common/Xcb/XcbBaseTestFixture.h b/Code/Framework/AzFramework/Tests/Platform/Common/Xcb/XcbBaseTestFixture.h
index 3c27099e16..524df3e436 100644
--- a/Code/Framework/AzFramework/Tests/Platform/Common/Xcb/XcbBaseTestFixture.h
+++ b/Code/Framework/AzFramework/Tests/Platform/Common/Xcb/XcbBaseTestFixture.h
@@ -10,6 +10,7 @@
 
 #include <gtest/gtest.h>
 #include <xcb/xcb.h>
+#include <AzCore/UnitTest/TestTypes.h>
 
 #include "MockXcbInterface.h"
 
@@ -17,7 +18,7 @@ namespace AzFramework
 {
     // Sets up mock behavior for the xcb library, providing an xcb_connection_t that is returned from a call to xcb_connect
     class XcbBaseTestFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::ScopedAllocatorSetupFixture
     {
     public:
         void SetUp() override;
diff --git a/scripts/build/Platform/Linux/build_linux.sh b/scripts/build/Platform/Linux/build_linux.sh
index 5861508060..2f33827c5b 100755
--- a/scripts/build/Platform/Linux/build_linux.sh
+++ b/scripts/build/Platform/Linux/build_linux.sh
@@ -32,8 +32,6 @@ else
     LAST_CMD=$(<${LAST_CONFIGURE_CMD_FILE})
     if [[ "${LAST_CMD}" != "${CONFIGURE_CMD}" ]]; then
         echo [ci_build] Last run command different, generating
-        echo "${LAST_CMD}=="
-        echo "${CONFIGURE_CMD}=="
         RUN_CONFIGURE=1
     fi
 fi