diff --git a/[editor]/editor_gui/client/test.lua b/[editor]/editor_gui/client/test.lua
index c12d1f700..ab921beff 100644
--- a/[editor]/editor_gui/client/test.lua
+++ b/[editor]/editor_gui/client/test.lua
@@ -223,6 +223,8 @@ function basicTest()
 		editor_main.resume(true)
 		inBasicTest = false
 		removeEventHandler("onClientPlayerDamage", localPlayer, noDamageInBasicTest)
+		removeEventHandler("onClientVehicleDamage", root, noDamageInBasicTest)
+		triggerServerEvent("onBasicTestEnd", localPlayer)
 		toggleControl("fire", true)
 		toggleControl("enter_exit", true)
 		toggleControl("enter_passenger", true)
@@ -247,6 +249,8 @@ function basicTest()
 		toggleControl("enter_passenger", false)
 		inBasicTest = true
 		addEventHandler("onClientPlayerDamage", localPlayer, noDamageInBasicTest)
+		addEventHandler("onClientVehicleDamage", root, noDamageInBasicTest)
+		triggerServerEvent("onBasicTestStart", localPlayer)
 		outputChatBox("Press F6 to leave basic test", 0, 255, 0)
 		bindControl ( "toggle_basictest", "down", basicTest )
 
diff --git a/[editor]/editor_gui/meta.xml b/[editor]/editor_gui/meta.xml
index 3d9269496..2f68f7c82 100644
--- a/[editor]/editor_gui/meta.xml
+++ b/[editor]/editor_gui/meta.xml
@@ -76,6 +76,7 @@
 	<!-- Server-side logic -->
 	<script src="server/guiserverlink.lua" type="server" />
 	<script src="server/interface.lua" type="server" />
+	<script src="server/override.lua" type="server" />
 
 	<!-- GUI icons -->
 	<!-- Most icons courtesy of the Evaraldo Crystal icon gallery -->
diff --git a/[editor]/editor_gui/server/override.lua b/[editor]/editor_gui/server/override.lua
new file mode 100644
index 000000000..a6ffdbb82
--- /dev/null
+++ b/[editor]/editor_gui/server/override.lua
@@ -0,0 +1,32 @@
+local playersInBasicTest = {}
+
+addEvent("onBasicTestStart", true)
+addEventHandler("onBasicTestStart", root, function()
+	if client and client ~= source then
+		return
+	end
+	playersInBasicTest[source] = true
+end)
+
+addEvent("onBasicTestEnd", true)
+addEventHandler("onBasicTestEnd", root, function()
+	if client and client ~= source then
+		return
+	end
+	playersInBasicTest[source] = nil
+end)
+
+addEventHandler("onPlayerQuit", root, function()
+	playersInBasicTest[source] = nil
+end)
+
+addEventHandler("onVehicleExplode", root, function()
+	for player in pairs(playersInBasicTest) do
+		if isElement(player) then
+			local vehicle = getPedOccupiedVehicle(player)
+			if vehicle == source then
+				cancelEvent()
+			end
+		end
+	end
+end)
\ No newline at end of file