diff --git a/tests/DMAPI/BasicOperation/Test.dm b/tests/DMAPI/BasicOperation/Test.dm
index 2da24d39d1..5f9b79e2f9 100644
--- a/tests/DMAPI/BasicOperation/Test.dm
+++ b/tests/DMAPI/BasicOperation/Test.dm
@@ -31,21 +31,6 @@
 /world/Reboot(reason)
 	TgsReboot()
 
-/proc/message_admins(event)
-	event = "Admins: [event]"
-	world << event
-	world.log << event
-
-var/list/clients = list()
-
-/client/New()
-	clients += src
-	return ..()
-
-/client/Del()
-	clients -= src
-	return ..()
-
 /datum/tgs_chat_command/echo
 	name = "echo"
 	help_text = "echos input parameters"
diff --git a/tests/DMAPI/LongRunning/Config.dm b/tests/DMAPI/LongRunning/Config.dm
new file mode 100644
index 0000000000..1fff7f2a61
--- /dev/null
+++ b/tests/DMAPI/LongRunning/Config.dm
@@ -0,0 +1,11 @@
+#define TGS_EXTERNAL_CONFIGURATION
+#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) var/##Name = ##Value
+#define TGS_READ_GLOBAL(Name) global.##Name
+#define TGS_WRITE_GLOBAL(Name, Value) global.##Name = ##Value
+#define TGS_PROTECT_DATUM(Path)
+#define TGS_WORLD_ANNOUNCE(message) world << ##message
+#define TGS_INFO_LOG(message) world.log << "Info: [##message]"
+#define TGS_WARNING_LOG(message) world.log << "Warn: [##message]"
+#define TGS_ERROR_LOG(message) world.log << "Err: [##message]"
+#define TGS_NOTIFY_ADMINS(event)
+#define TGS_CLIENT_COUNT 0
diff --git a/tests/DMAPI/LongRunning/Test.dm b/tests/DMAPI/LongRunning/Test.dm
new file mode 100644
index 0000000000..5b543affd2
--- /dev/null
+++ b/tests/DMAPI/LongRunning/Test.dm
@@ -0,0 +1,20 @@
+/world/New()
+	log << "About to call TgsNew()"
+	TgsNew(minimum_required_security_level = TGS_SECURITY_SAFE)
+	log << "About to call StartAsync()"
+	StartAsync()
+
+/proc/StartAsync()
+	set waitfor = FALSE
+	Run()
+
+/proc/Run()
+	world.log << "sleep"
+	sleep(50)
+	world.TgsInitializationsComplete()
+
+/world/Topic(T, Addr, Master, Keys)
+	TGS_TOPIC
+
+/world/Reboot(reason)
+	TgsReboot()
diff --git a/tests/DMAPI/LongRunning/long_running_test.dme b/tests/DMAPI/LongRunning/long_running_test.dme
new file mode 100644
index 0000000000..92781c7e16
--- /dev/null
+++ b/tests/DMAPI/LongRunning/long_running_test.dme
@@ -0,0 +1,17 @@
+// Hand crafted DME, will not work if saved with DreamMaker
+
+// BEGIN_INTERNALS
+// END_INTERNALS
+
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+// END_FILE_DIR
+
+// BEGIN_PREFERENCES
+// END_PREFERENCES
+
+// BEGIN_INCLUDE
+#include "Config.dm"
+#include "..\tgs_include.dm"
+#include "Test.dm"
+// END_INCLUDE