diff --git a/Code/Framework/AzFramework/Tests/AssetProcessorConnection.cpp b/Code/Framework/AzFramework/Tests/AssetProcessorConnection.cpp
index 2023410397..6c44a882f4 100644
--- a/Code/Framework/AzFramework/Tests/AssetProcessorConnection.cpp
+++ b/Code/Framework/AzFramework/Tests/AssetProcessorConnection.cpp
@@ -92,11 +92,7 @@ protected:
 
 };
 
-#if AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
-TEST_F(APConnectionTest, DISABLED_TestAddRemoveCallbacks)
-#else
 TEST_F(APConnectionTest, TestAddRemoveCallbacks)
-#endif // AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
 {
     using namespace AzFramework;
 
@@ -218,11 +214,7 @@ TEST_F(APConnectionTest, TestAddRemoveCallbacks)
     EXPECT_TRUE(WaitForConnectionStateToBeEqual(apConnection, SocketConnection::EConnectionState::Disconnected));
 }
 
-#if AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
-TEST_F(APConnectionTest, DISABLED_TestAddRemoveCallbacks_RemoveDuringCallback_DoesNotCrash)
-#else
 TEST_F(APConnectionTest, TestAddRemoveCallbacks_RemoveDuringCallback_DoesNotCrash)
-#endif // AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
 {
     using namespace AzFramework;
 
@@ -313,11 +305,7 @@ TEST_F(APConnectionTest, TestAddRemoveCallbacks_RemoveDuringCallback_DoesNotCras
     EXPECT_TRUE(WaitForConnectionStateToBeEqual(apConnection, SocketConnection::EConnectionState::Disconnected));
 }
 
-#if AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
-TEST_F(APConnectionTest, DISABLED_TestAddRemoveCallbacks_AddDuringCallback_DoesNotCrash)
-#else
 TEST_F(APConnectionTest, TestAddRemoveCallbacks_AddDuringCallback_DoesNotCrash)
-#endif // AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
 {
     using namespace AzFramework;
 
@@ -451,11 +439,7 @@ TEST_F(APConnectionTest, TestAddRemoveCallbacks_AddDuringCallback_DoesNotCrash)
     EXPECT_TRUE(WaitForConnectionStateToBeEqual(apConnection, SocketConnection::EConnectionState::Disconnected));
 }
 
-#if AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
-TEST_F(APConnectionTest, DISABLED_TestConnection)
-#else
 TEST_F(APConnectionTest, TestConnection)
-#endif // AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
 {
     using namespace AzFramework;
 
@@ -557,11 +541,7 @@ TEST_F(APConnectionTest, TestConnection)
     EXPECT_TRUE(WaitForConnectionStateToBeEqual(apListener, SocketConnection::EConnectionState::Disconnected));
 }
 
-#if AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
-TEST_F(APConnectionTest, DISABLED_TestReconnect)
-#else
 TEST_F(APConnectionTest, TestReconnect)
-#endif // AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
 {
     using namespace AzFramework;
 
diff --git a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
index b3939f1ef2..dfe4bdb3c5 100644
--- a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
+++ b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
@@ -15,16 +15,12 @@
 
 #define AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS true
 
-#define AZ_TRAIT_DISABLE_FAILED_FRAMEPROFILER_TEST true
-#define AZ_TRAIT_DISABLE_FAILED_FRAMEWORK_TESTS true
-
 #define AZ_TRAIT_DISABLE_FAILED_MULTIPLAYER_GRIDMATE_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_NATIVE_WINDOWS_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_EMOTION_FX_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_DLL_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_MODULE_TESTS true
 #define AZ_TRAIT_DISABLE_FAILED_EMOTION_FX_EDITOR_TESTS true
-#define AZ_TRAIT_DISABLE_FAILED_METRICS_TESTS true
 
 // Golden perline gradiant values for random seed 7878 for this platform
 #define AZ_TRAIT_UNIT_TEST_PERLINE_GRADIANT_GOLDEN_VALUES_7878  0.5000f, 0.4455f, 0.4838f, 0.4589f, \