diff --git a/src/libANGLE/renderer/d3d/HLSLCompiler.cpp b/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
index 3239295682..1b56cbc823 100644
--- a/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+++ b/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
@@ -149,7 +149,7 @@ angle::Result HLSLCompiler::ensureInitialized(d3d::Context *context)
         }
         else
         {
-            WARN() << "Failed to load HLSL compiler library. Trying old DLL.";
+            WARN() << "Failed to load HLSL compiler library. Using 'old' DLL.";
             mD3DCompilerModule = LoadLibraryA(kOldCompilerLibrary);
             if (mD3DCompilerModule)
             {
@@ -162,7 +162,7 @@ angle::Result HLSLCompiler::ensureInitialized(d3d::Context *context)
     if (!mD3DCompilerModule)
     {
         DWORD lastError = GetLastError();
-        ERR() << "LoadLibrary(" << D3DCOMPILER_DLL_A << ") failed. GetLastError=" << lastError;
+        ERR() << "D3D Compiler LoadLibrary failed. GetLastError=" << lastError;
         ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.D3DCompilerLoadLibraryResult", D3DCompilerFailure,
                                     D3DCompilerEnumBoundary);
         ANGLE_TRY_HR(context, E_OUTOFMEMORY, "LoadLibrary failed to load D3D Compiler DLL.");
diff --git a/src/tests/test_utils/ANGLETest.cpp b/src/tests/test_utils/ANGLETest.cpp
index b1baf57fd7..132989735b 100644
--- a/src/tests/test_utils/ANGLETest.cpp
+++ b/src/tests/test_utils/ANGLETest.cpp
@@ -18,6 +18,10 @@
 #    include "util/windows/WGLWindow.h"
 #endif  // defined(ANGLE_USE_UTIL_LOADER) && defined(ANGLE_PLATFORM_WINDOWS)
 
+#if defined(ANGLE_PLATFORM_WINDOWS)
+#    include <VersionHelpers.h>
+#endif  // defined(ANGLE_PLATFORM_WINDOWS)
+
 namespace angle
 {
 
@@ -1276,7 +1280,13 @@ void ANGLETestBase::ignoreD3D11SDKLayersWarnings()
 
 void ANGLETestBase::treatPlatformWarningsAsErrors()
 {
-    mPlatformContext.warningsAsErrors = true;
+#if defined(ANGLE_PLATFORM_WINDOWS)
+    // Disable on Windows 7-8. We are falling back to the old compiler DLL.
+    if (!IsWindows10OrGreater())
+    {
+        mPlatformContext.warningsAsErrors = true;
+    }
+#endif  // defined(ANGLE_PLATFORM_WINDOWS)
 }
 
 ANGLETestBase::ScopedIgnorePlatformMessages::ScopedIgnorePlatformMessages(ANGLETestBase *test)