diff --git a/Common/Common_Test.vcxproj b/Common/Common_Test.vcxproj
index 20ab3660..995f6ac8 100644
--- a/Common/Common_Test.vcxproj
+++ b/Common/Common_Test.vcxproj
@@ -12,9 +12,15 @@
     <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ItemGroup>
-    <ClCompile Include="MathParser_Test.cpp" />
-    <ClCompile Include="PathUtil_Test.cpp" />
-    <ClCompile Include="StringUtil_Test.cpp" />
+    <ClCompile Include="MathParser_Test.cpp">
+      <ExcludedFromBuild>$(ExcludeTestFile)</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="PathUtil_Test.cpp">
+      <ExcludedFromBuild>$(ExcludeTestFile)</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="StringUtil_Test.cpp">
+      <ExcludedFromBuild>$(ExcludeTestFile)</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="Common.vcxproj">
diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj
index 168e7676..cefbfb09 100644
--- a/Library/Library.vcxproj
+++ b/Library/Library.vcxproj
@@ -23,7 +23,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll</DelayLoadDLLs>
+      <DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll;$(DelayLoadTestDLL)</DelayLoadDLLs>
       <ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
@@ -35,7 +35,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll</DelayLoadDLLs>
+      <DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll;$(DelayLoadTestDLL)</DelayLoadDLLs>
       <ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
@@ -88,7 +88,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="ConfigParser_Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeTestFile)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="DialogAbout.cpp">
       <PrecompiledHeader>Use</PrecompiledHeader>
diff --git a/Rainmeter.props b/Rainmeter.props
index 5a9bf606..4c3301f0 100644
--- a/Rainmeter.props
+++ b/Rainmeter.props
@@ -30,16 +30,23 @@
     <OutDir Condition="'$(ConfigurationType)'=='StaticLibrary'">$(IntDir)</OutDir>
   </PropertyGroup>
 
+  <!-- Macros for unit testing. -->
+  <PropertyGroup Label="UserMacros">
+    <ExcludeTestFile>true</ExcludeTestFile>
+    <ExcludeTestFile Condition="'$(Configuration)'=='Debug'">false</ExcludeTestFile>
+
+    <!-- Non-static projects must delayload CppUnitTestFramework.dll to avoid the "module not found"
+         errors (since CppUnitTestFramework.dll is available only when running tests). -->
+    <DelayLoadTestDLL Condition="'$(ConfigurationType)'!='StaticLibrary'">Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll</DelayLoadTestDLL>
+  </PropertyGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
       <!-- Set the version macros to 0x0601 (Win7) to avoid using Win8 specific features in the Win8 SDK. -->
       <PreprocessorDefinitions>WIN32;_WINDOWS;WINVER=0x0601;_WIN32_WINNT=0x0601;_WIN32_IE=0x0601;PSAPI_VERSION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -51,11 +58,13 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
+      <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <Link>
+      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <ResourceCompile>