diff --git a/Externals/gtest/include/gtest/internal/gtest-filepath.h b/Externals/gtest/include/gtest/internal/gtest-filepath.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-internal.h b/Externals/gtest/include/gtest/internal/gtest-internal.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-linked_ptr.h b/Externals/gtest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h b/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/Externals/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/Externals/gtest/include/gtest/internal/gtest-param-util.h b/Externals/gtest/include/gtest/internal/gtest-param-util.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-port-arch.h b/Externals/gtest/include/gtest/internal/gtest-port-arch.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-port.h b/Externals/gtest/include/gtest/internal/gtest-port.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-string.h b/Externals/gtest/include/gtest/internal/gtest-string.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-tuple.h b/Externals/gtest/include/gtest/internal/gtest-tuple.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-tuple.h.pump b/Externals/gtest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/Externals/gtest/include/gtest/internal/gtest-type-util.h b/Externals/gtest/include/gtest/internal/gtest-type-util.h
diff --git a/Externals/gtest/include/gtest/internal/gtest-type-util.h.pump b/Externals/gtest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/Externals/gtest/src/gtest-all.cc b/Externals/gtest/src/gtest-all.cc
diff --git a/Externals/gtest/src/gtest-death-test.cc b/Externals/gtest/src/gtest-death-test.cc
diff --git a/Externals/gtest/src/gtest-filepath.cc b/Externals/gtest/src/gtest-filepath.cc
diff --git a/Externals/gtest/src/gtest-internal-inl.h b/Externals/gtest/src/gtest-internal-inl.h
diff --git a/Externals/gtest/src/gtest-port.cc b/Externals/gtest/src/gtest-port.cc
diff --git a/Externals/gtest/src/gtest-printers.cc b/Externals/gtest/src/gtest-printers.cc
diff --git a/Externals/gtest/src/gtest-test-part.cc b/Externals/gtest/src/gtest-test-part.cc
diff --git a/Externals/gtest/src/gtest-typed-test.cc b/Externals/gtest/src/gtest-typed-test.cc
diff --git a/Externals/gtest/src/gtest.cc b/Externals/gtest/src/gtest.cc
diff --git a/Externals/gtest/src/gtest_main.cc b/Externals/gtest/src/gtest_main.cc
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
@@ -19,7 +19,7 @@
   <ItemDefinitionGroup>
     <!--This project also compiles gtest-->
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)gtest\include;$(ExternalsDir)gtest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)gtest\googletest\include;$(ExternalsDir)gtest\googletest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -35,7 +35,7 @@
   </ItemGroup>
   <ItemGroup>
     <!--gtest is rather small, so just include it into the build here-->
-    <ClCompile Include="$(ExternalsDir)gtest\src\gtest-all.cc" />
+    <ClCompile Include="$(ExternalsDir)gtest\googletest\src\gtest-all.cc" />
     <!--Lump all of the tests (and supporting code) into one binary-->
     <ClCompile Include="UnitTestsMain.cpp" />
     <ClCompile Include="Common\BitFieldTest.cpp" />

diff --git a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
@@ -115,7 +115,7 @@ class VertexLoaderParamTest
           std::tuple<VertexComponentFormat, ComponentFormat, CoordComponentCount, int>>
 {
 };
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     AllCombinations, VertexLoaderParamTest,
     ::testing::Combine(
         ::testing::Values(VertexComponentFormat::Direct, VertexComponentFormat::Index8,
@@ -259,7 +259,7 @@ class VertexLoaderSpeedTest : public VertexLoaderTest,
                               public ::testing::WithParamInterface<std::tuple<ComponentFormat, int>>
 {
 };
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     FormatsAndElements, VertexLoaderSpeedTest,
     ::testing::Combine(::testing::Values(ComponentFormat::UByte, ComponentFormat::Byte,
                                          ComponentFormat::UShort, ComponentFormat::Short,
@@ -537,7 +537,7 @@ class VertexLoaderNormalTest
           std::tuple<VertexComponentFormat, ComponentFormat, NormalComponentCount, bool>>
 {
 };
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     AllCombinations, VertexLoaderNormalTest,
     ::testing::Combine(
         ::testing::Values(VertexComponentFormat::NotPresent, VertexComponentFormat::Direct,