diff --git a/CHANGELOG.md b/CHANGELOG.md
index 094d3e20..0d5f6f2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Version 264:
 * Remove unused functions in `impl/static_string.hpp`
 * Fix unused variable warning in `multi_buffer`
 * Fix header-only compilation errors in some configurations
+* Workaround for miscompilation in MSVC 14.2
 
 --------------------------------------------------------------------------------
 
diff --git a/test/beast/core/static_string.cpp b/test/beast/core/static_string.cpp
index 50ff839f..6e14715a 100644
--- a/test/beast/core/static_string.cpp
+++ b/test/beast/core/static_string.cpp
@@ -569,7 +569,8 @@ public:
         //
 
         {
-            static_string<7> s1("12345");
+            // Using 7 as the size causes a miscompile in MSVC14.2 x64 Release
+            static_string<8> s1("12345");
             s1.insert(2, 2, '_');
             BEAST_EXPECT(s1 == "12__345");
             BEAST_EXPECT(*s1.end() == 0);