diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h
index aad04dd3f6..1dd3e60a80 100644
--- a/src/openrct2/ride/Vehicle.h
+++ b/src/openrct2/ride/Vehicle.h
@@ -20,12 +20,12 @@
 #include "../common.h"
 #include "../world/map.h"
 
-#pragma pack(push, 1)
 typedef struct rct_vehicle_colour {
     uint8 body_colour;
     uint8 trim_colour;
 } rct_vehicle_colour;
 
+#pragma pack(push, 1)
 /**
  * Ride type vehicle structure.
  * size: 0x65
diff --git a/test/testpaint/TestPaint.cpp b/test/testpaint/TestPaint.cpp
index 5a83e68972..9077a3efac 100644
--- a/test/testpaint/TestPaint.cpp
+++ b/test/testpaint/TestPaint.cpp
@@ -53,7 +53,7 @@ namespace TestPaint
         {
             Ride ride = {0};
             ride.entrance_style = RIDE_ENTRANCE_STYLE_PLAIN;
-            rct_ride_entry rideEntry = {0};
+            static rct_ride_entry rideEntry = {0};
             rct_ride_entry_vehicle vehicleEntry { 0 };
             vehicleEntry.base_image_id = 0x70000;
             rideEntry.vehicles[0] = vehicleEntry;
@@ -61,12 +61,8 @@ namespace TestPaint
             gRideEntries[0] = &rideEntry;
         }
         {
-            rct2_ride ride;
+            rct2_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;
             RCT2_Rides[0] = ride;
         }
 
diff --git a/test/testpaint/addresses.h b/test/testpaint/addresses.h
index 4634085728..d37e74c5bd 100644
--- a/test/testpaint/addresses.h
+++ b/test/testpaint/addresses.h
@@ -1,4 +1,3 @@
-
 #pragma region Copyright (c) 2014-2017 OpenRCT2 Developers
 /*****************************************************************************
  * OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
@@ -58,4 +57,4 @@ sint32 RCT2_CALLPROC_X(sint32 address, sint32 _eax, sint32 _ebx, sint32 _ecx, si
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif