diff --git a/openrct2.common.props b/openrct2.common.props
index 64d144e987..8f232be473 100644
--- a/openrct2.common.props
+++ b/openrct2.common.props
@@ -36,7 +36,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
+      <AdditionalOptions>/utf-8 /std:c++latest</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;version.lib;winmm.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/common.h b/src/common.h
index 4172604263..de9842f7f9 100644
--- a/src/common.h
+++ b/src/common.h
@@ -76,11 +76,12 @@ typedef uint8 colour_t;
 #ifndef max
 #define max(a,b)            (((a) > (b)) ? (a) : (b))
 #endif
-#endif // __cplusplus
 
 #define sgn(x)				((x > 0) ? 1 : ((x < 0) ? -1 : 0))
 #define clamp(l, x, h)		(min(h, max(l, x)))
 
+#endif // __cplusplus
+
 // Rounds an integer down to the given power of 2. y must be a power of 2.
 #define floor2(x, y)		((x) & (~((y) - 1)))
 
diff --git a/test/tests/tests.vcxproj b/test/tests/tests.vcxproj
index 3e42ab8e4a..41cde7ef0a 100644
--- a/test/tests/tests.vcxproj
+++ b/test/tests/tests.vcxproj
@@ -37,6 +37,9 @@
     <LibraryPath>$(SolutionDir)bin;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>GTEST_LANG_CXX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>openrct2.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>