diff --git a/Aegisub.sln b/Aegisub.sln
index 9d156dcad..ba818c3c6 100644
--- a/Aegisub.sln
+++ b/Aegisub.sln
@@ -72,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost", "aegisub\build\boos
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "aegisub\build\icu\icu.vcxproj", "{F934AB7B-186B-4E96-B20C-A58C38C1B818}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googletest", "aegisub\build\googletest\googletest.vcxproj", "{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -307,6 +309,14 @@ Global
 		{F934AB7B-186B-4E96-B20C-A58C38C1B818}.Release|Win32.Build.0 = Release|Win32
 		{F934AB7B-186B-4E96-B20C-A58C38C1B818}.Release|x64.ActiveCfg = Release|x64
 		{F934AB7B-186B-4E96-B20C-A58C38C1B818}.Release|x64.Build.0 = Release|x64
+		{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}.Debug|Win32.Build.0 = Debug|Win32
+		{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}.Debug|x64.ActiveCfg = Debug|Win32
+		{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32
+		{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}.Debug-MinDep|x64.ActiveCfg = Debug|Win32
+		{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}.Release|Win32.ActiveCfg = Release|Win32
+		{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}.Release|Win32.Build.0 = Release|Win32
+		{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/aegisub/build/Aegisub/Aegisub.xml b/aegisub/build/Aegisub/Aegisub.xml
index b3e04e116..be3cb67e7 100644
--- a/aegisub/build/Aegisub/Aegisub.xml
+++ b/aegisub/build/Aegisub/Aegisub.xml
@@ -243,6 +243,14 @@
     Description="Location of ICU source code."
     />
 
+  <StringProperty
+    Subtype="folder"
+    Name="GtestSrcDir"
+    Category="Paths"
+    DisplayName="googletest source path"
+    Description="Location of googletest source code."
+    />
+
   <StringProperty
     Subtype="folder"
     Name="LibassSrcDir"
diff --git a/aegisub/build/DefaultConfiguration.props b/aegisub/build/DefaultConfiguration.props
index 76df48cb0..846380397 100644
--- a/aegisub/build/DefaultConfiguration.props
+++ b/aegisub/build/DefaultConfiguration.props
@@ -59,6 +59,7 @@
     <Freetype2SrcDir>..\..\..\deps\freetype2</Freetype2SrcDir>
     <FribidiSrcDir>..\..\..\deps\fribidi</FribidiSrcDir>
     <FontconfigSrcDir>..\..\..\deps\fontconfig</FontconfigSrcDir>
+    <GtestSrcDir>..\..\..\deps\googletest</GtestSrcDir>
     <IcuSrcDir>..\..\..\deps\icu\source</IcuSrcDir>
     <LibassSrcDir>..\..\..\deps\libass</LibassSrcDir>
     <WxSrcDir>..\..\..\deps\wxWidgets</WxSrcDir>
diff --git a/aegisub/build/googletest/googletest.vcxproj b/aegisub/build/googletest/googletest.vcxproj
new file mode 100644
index 000000000..e68c22b30
--- /dev/null
+++ b/aegisub/build/googletest/googletest.vcxproj
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}</ProjectGuid>
+    <RootNamespace>googletest</RootNamespace>
+  </PropertyGroup>
+
+  <!-- Aegisub project configuration -->
+  <PropertyGroup Label="AegisubConfiguration">
+    <AegisubProjectType>lib</AegisubProjectType>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
+  </ImportGroup>
+
+  <!-- Project specific configuration -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>
+        GTEST_HAS_TR1_TUPLE=0;
+        %(PreprocessorDefinitions)
+      </PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>
+        $(GtestSrcDir);
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+  <!-- Source files -->
+  <ItemGroup>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-death-test.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-message.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-param-test.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-printers.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-spi.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-test-part.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-typed-test.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest_pred_impl.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest_prod.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-death-test-internal.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-filepath.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-internal.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-linked_ptr.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-param-util-generated.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-param-util.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-port.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-string.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-tuple.h" />
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-type-util.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(GtestSrcDir)\include\gtest\gtest-param-test.h.pump" />
+    <None Include="$(GtestSrcDir)\include\gtest\internal\gtest-param-util-generated.h.pump" />
+    <None Include="$(GtestSrcDir)\include\gtest\internal\gtest-tuple.h.pump" />
+    <None Include="$(GtestSrcDir)\include\gtest\internal\gtest-type-util.h.pump" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(GtestSrcDir)\src\gtest-all.cc" />
+  </ItemGroup>
+</Project>
diff --git a/aegisub/build/googletest/googletest.vcxproj.filters b/aegisub/build/googletest/googletest.vcxproj.filters
new file mode 100644
index 000000000..54e13bb51
--- /dev/null
+++ b/aegisub/build/googletest/googletest.vcxproj.filters
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Header Files\internal">
+      <UniqueIdentifier>{ad1eaa10-1448-406d-924c-ec1a608cec0b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest_pred_impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest_prod.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-death-test.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-message.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-param-test.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-printers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-spi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-test-part.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\gtest-typed-test.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-death-test-internal.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-filepath.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-internal.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-linked_ptr.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-param-util.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-param-util-generated.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-port.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-string.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-tuple.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="$(GtestSrcDir)\include\gtest\internal\gtest-type-util.h">
+      <Filter>Header Files\internal</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(GtestSrcDir)\include\gtest\gtest-param-test.h.pump">
+      <Filter>Header Files</Filter>
+    </None>
+    <None Include="$(GtestSrcDir)\include\gtest\internal\gtest-param-util-generated.h.pump">
+      <Filter>Header Files\internal</Filter>
+    </None>
+    <None Include="$(GtestSrcDir)\include\gtest\internal\gtest-tuple.h.pump">
+      <Filter>Header Files\internal</Filter>
+    </None>
+    <None Include="$(GtestSrcDir)\include\gtest\internal\gtest-type-util.h.pump">
+      <Filter>Header Files\internal</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(GtestSrcDir)\src\gtest-all.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/aegisub/build/standard-settings.props b/aegisub/build/standard-settings.props
index 290e24bd6..b41ab38e0 100644
--- a/aegisub/build/standard-settings.props
+++ b/aegisub/build/standard-settings.props
@@ -27,6 +27,7 @@
 				$(AegisubSourceBase)src\msvc;
 				$(AegisubSourceBase)\include;
 				$(BoostPath);
+				$(GtestSrcDir)\include;
 				$(IcuSrcDir)\include;
 				%(AdditionalIncludeDirectories)
 			</AdditionalIncludeDirectories>