diff --git a/test/testpaint/TestPaint.cpp b/test/testpaint/TestPaint.cpp
index f3433a3051..5a83e68972 100644
--- a/test/testpaint/TestPaint.cpp
+++ b/test/testpaint/TestPaint.cpp
@@ -50,18 +50,25 @@ namespace TestPaint
         RCT2_Unk140E9A8 = &dpi;
         gPaintSession.Unk140E9A8 = &dpi;
 
-        Ride ride = {0};
-        ride.entrance_style = RIDE_ENTRANCE_STYLE_PLAIN;
-
-        rct_ride_entry rideEntry = {0};
-        rct_ride_entry_vehicle vehicleEntry { 0 };
-        vehicleEntry.base_image_id = 0x70000;
-        rideEntry.vehicles[0] = vehicleEntry;
-
-        gRideList[0] = ride;
-        RCT2_Rides[0] = ride;
-
-        gRideEntries[0] = &rideEntry;
+        {
+            Ride ride = {0};
+            ride.entrance_style = RIDE_ENTRANCE_STYLE_PLAIN;
+            rct_ride_entry rideEntry = {0};
+            rct_ride_entry_vehicle vehicleEntry { 0 };
+            vehicleEntry.base_image_id = 0x70000;
+            rideEntry.vehicles[0] = vehicleEntry;
+            gRideList[0] = ride;
+            gRideEntries[0] = &rideEntry;
+        }
+        {
+            rct2_ride ride;
+            ride.entrance_style = RIDE_ENTRANCE_STYLE_PLAIN;
+            rct_ride_entry rideEntry = {0};
+            rct_ride_entry_vehicle vehicleEntry { 0 };
+            vehicleEntry.base_image_id = 0x70000;
+            rideEntry.vehicles[0] = vehicleEntry;
+            RCT2_Rides[0] = ride;
+        }
 
         g141E9DB = G141E9DB_FLAG_1 | G141E9DB_FLAG_2;
         gPaintSession.Unk141E9DB = G141E9DB_FLAG_1 | G141E9DB_FLAG_2;
diff --git a/test/testpaint/TestPaint.hpp b/test/testpaint/TestPaint.hpp
index cea4b1b958..22968bca0b 100644
--- a/test/testpaint/TestPaint.hpp
+++ b/test/testpaint/TestPaint.hpp
@@ -55,7 +55,7 @@ extern "C"
 #define RCT2_CurrentViewportFlags   RCT2_GLOBAL(0x0141E9E4, uint32)
 #define RCT2_CurrentRotation        RCT2_GLOBAL(0x0141E9E0, uint8)
 #define RCT2_ScenarioTicks          RCT2_GLOBAL(0x00F663AC, uint32)
-#define RCT2_Rides                  RCT2_ADDRESS(0x013628F8, Ride)
+#define RCT2_Rides                  RCT2_ADDRESS(0x013628F8, rct2_ride)
 #define RCT2_Unk140E9A8             RCT2_GLOBAL(0x0140E9A8, rct_drawpixelinfo *)
 #define RCT2_PaintBoundBoxOffsetX   RCT2_GLOBAL(0x009DEA52, sint16)
 #define RCT2_PaintBoundBoxOffsetY   RCT2_GLOBAL(0x009DEA54, sint16)