diff --git a/openrct2.proj b/openrct2.proj
index 4fba588b48..25c8e84ba5 100644
--- a/openrct2.proj
+++ b/openrct2.proj
@@ -165,9 +165,6 @@
     <Message Condition="'$(BuildString)'!=''" Text="Building $(BuildString)" Importance="high" />
     <Copy SourceFiles="@(CopyItems)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="@(DataItems)" DestinationFolder="$(TargetDir)data\%(RecursiveDir)" SkipUnchangedFiles="true" />
-
-    <!-- tests -->
-    <Copy SourceFiles="@(CopyItems)" DestinationFolder="$(TargetDir)testpaint\" />
   </Target>
 
   <Target Name="Build">
@@ -191,9 +188,6 @@
   <Target Name="TestNoRCT2" DependsOnTargets="Build">
     <Exec Command="$(TargetDir)tests\tests.exe &quot;--gtest_filter=-RideRatings*&quot; &quot;--gtest_output=xml:$(ArtifactsDir)test-results.xml&quot;" />
   </Target>
-  <Target Name="TestPaint" DependsOnTargets="Build" Condition="'$(Platform)'=='Win32'">
-    <Exec Command="$(TargetDir)testpaint\openrct2.exe" />
-  </Target>
 
   <!-- Target to build g2.dat containing OpenRCT2 sprites -->
   <Target Name="g2" DependsOnTargets="Build" AfterTargets="Build" Inputs="@(g2Inputs)" Outputs="$(g2Output)"
diff --git a/openrct2.sln b/openrct2.sln
index b42ef99c1a..8283dd4ee9 100644
--- a/openrct2.sln
+++ b/openrct2.sln
@@ -23,8 +23,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "test\tests\tests.v
 		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpaint", "test\testpaint\testpaint.vcxproj", "{57E60BA1-FB76-4316-909E-C1449C142327}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2202A816-377D-4FA0-A7AF-7D4105F8A4FB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{480B577D-4E4A-4757-9A42-28A9AD33E6B0}"
@@ -79,11 +77,6 @@ Global
 		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|Win32.Build.0 = Release|Win32
 		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|x64.ActiveCfg = Release|x64
 		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|x64.Build.0 = Release|x64
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Debug|Win32.ActiveCfg = Debug|Win32
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Debug|Win32.Build.0 = Debug|Win32
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Debug|x64.ActiveCfg = Debug|Win32
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Release|Win32.ActiveCfg = Release|Win32
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Release|x64.ActiveCfg = Release|Win32
 		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Debug|Win32.Build.0 = Debug|Win32
 		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Debug|x64.ActiveCfg = Debug|x64
@@ -109,7 +102,6 @@ Global
 		{7A9A57D5-7006-4208-A290-5491BA3C8808} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
 		{D24D94F6-2A74-480C-B512-629C306CE92F} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
 		{62B020FA-E4FB-4C6E-B32A-DC999470F155} = {480B577D-4E4A-4757-9A42-28A9AD33E6B0}
-		{57E60BA1-FB76-4316-909E-C1449C142327} = {480B577D-4E4A-4757-9A42-28A9AD33E6B0}
 		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
 		{B6808F71-30B4-4499-8FF6-0B1C86391842} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
 	EndGlobalSection
diff --git a/test/testpaint/testpaint.vcxproj b/test/testpaint/testpaint.vcxproj
deleted file mode 100644
index ae99fd9725..0000000000
--- a/test/testpaint/testpaint.vcxproj
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SolutionDir Condition="'$(SolutionDir)'==''">..\..\</SolutionDir>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{57E60BA1-FB76-4316-909E-C1449C142327}</ProjectGuid>
-    <RootNamespace>testpaint</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\openrct2.common.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)bin\testpaint\</OutDir>
-    <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetName>openrct2</TargetName>
-    <IncludePath>$(SolutionDir)lib\include;$(SolutionDir)lib\include\breakpad;$(SolutionDir)lib\include\libspeex;$(SolutionDir)lib\include\sdl;$(SolutionDir)lib\include\jansson;$(SolutionDir)lib\include\sdl_ttf;$(SolutionDir)lib\include\libpng;$(SolutionDir)lib\include\zlib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)bin\testpaint\</OutDir>
-    <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetName>openrct2</TargetName>
-    <IncludePath>$(SolutionDir)lib\include;$(SolutionDir)lib\include\breakpad;$(SolutionDir)lib\include\libspeex;$(SolutionDir)lib\include\sdl;$(SolutionDir)lib\include\jansson;$(SolutionDir)lib\include\sdl_ttf;$(SolutionDir)lib\include\libpng;$(SolutionDir)lib\include\zlib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>__TESTPAINT__;DEBUG;NO_VEHICLES;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DisableSpecificWarnings>4200</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>__TESTPAINT__;NO_VEHICLES;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DisableSpecificWarnings>4200</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="data.h" />
-    <ClInclude Include="intercept.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\openrct2\paint\paint_helpers.c" />
-    <ClCompile Include="compat.c" />
-    <ClCompile Include="data.c" />
-    <ClCompile Include="FunctionCall.cpp" />
-    <ClCompile Include="GeneralSupportHeightCall.cpp" />
-    <ClCompile Include="generate.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="PaintIntercept.cpp" />
-    <ClCompile Include="Printer.cpp" />
-    <ClCompile Include="SegmentSupportHeightCall.cpp" />
-    <ClCompile Include="SideTunnelCall.cpp" />
-    <ClCompile Include="String.cpp" />
-    <ClCompile Include="TestPaint.cpp" />
-    <ClCompile Include="TestTrack.cpp" />
-    <ClCompile Include="Utils.cpp" />
-    <ClCompile Include="VerticalTunnelCall.cpp" />
-    <ClCompile Include="..\..\src\openrct2\diagnostic.c" />
-    <ClCompile Include="..\..\src\openrct2\paint\map_element\map_element.c" />
-    <ClCompile Include="..\..\src\openrct2\rct2\addresses.c" />
-    <ClCompile Include="..\..\src\openrct2\rct2\hook.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\air_powered_vertical_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\bobsleigh_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\compact_inverted_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\corkscrew_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\flying_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\giga_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\heartline_twister_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\inverted_hairpin_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\inverted_impulse_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\inverted_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\junior_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\lay_down_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\lim_launched_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\looping_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\mine_ride.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\mine_train_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\mini_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\mini_suspended_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\multi_dimension_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\reverser_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\reverse_freefall_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\side_friction_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\stand_up_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\steeplechase.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\suspended_swinging_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\twister_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\vertical_drop_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\virginia_reel.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\wild_mouse.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\wooden_roller_coaster.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\coaster\wooden_wild_mouse.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\car_ride.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\circus_show.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\crooked_house.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\dodgems.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\ferris_wheel.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\flying_saucers.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\ghost_train.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\haunted_house.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\maze.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\merry_go_round.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\mini_golf.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\mini_helicopters.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\monorail_cycles.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\observation_tower.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\space_rings.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\gentle\spiral_slide.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\ride_data.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\shops\facility.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\shops\shop.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\3d_cinema.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\enterprise.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\go_karts.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\launched_freefall.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\magic_carpet.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\motion_simulator.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\pirate_ship.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\roto_drop.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\swinging_inverter_ship.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\top_spin.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\thrill\twist.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\track_data.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\track_data_old.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\track_paint.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\transport\chairlift.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\transport\lift.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\transport\miniature_railway.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\transport\monorail.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\transport\suspended_monorail.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\water\boat_ride.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\water\dingy_slide.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\water\log_flume.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\water\river_rapids.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\water\splash_boats.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\water\submarine_ride.c" />
-    <ClCompile Include="..\..\src\openrct2\ride\water\water_coaster.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/test/testpaint/testpaint.vcxproj.user b/test/testpaint/testpaint.vcxproj.user
deleted file mode 100644
index 65d96a1fbf..0000000000
--- a/test/testpaint/testpaint.vcxproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommand>$(TargetDir)\openrct2.exe</LocalDebuggerCommand>
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>--ride-type 68 --generate</LocalDebuggerCommandArguments>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ShowAllFiles>false</ShowAllFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file