diff --git a/evennia/server/tests/test_launcher.py b/evennia/server/tests/test_launcher.py
index 5ce86fcd4e..2b894a0720 100644
--- a/evennia/server/tests/test_launcher.py
+++ b/evennia/server/tests/test_launcher.py
@@ -7,14 +7,13 @@ import os
 import pickle
 
 from anything import Something
+from evennia.server import evennia_launcher
+from evennia.server.portal import amp
 from mock import MagicMock, create_autospec, patch
 from twisted.internet import reactor
 from twisted.internet.base import DelayedCall
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
-from evennia.server import evennia_launcher
-from evennia.server.portal import amp
-
 DelayedCall.debug = True
 
 
@@ -68,27 +67,27 @@ class TestLauncher(TwistedTestCase):
     @patch("evennia.server.evennia_launcher.os.name", new="posix")
     def test_get_twisted_cmdline(self):
         pcmd, scmd = evennia_launcher._get_twistd_cmdline(False, False)
-        self.assertTrue("portal.py" in pcmd[1])
-        self.assertTrue("--pidfile" in pcmd[2])
-        self.assertTrue("server.py" in scmd[1])
-        self.assertTrue("--pidfile" in scmd[2])
+        self.assertIn("portal.py", pcmd[1])
+        self.assertIn("--pidfile", pcmd[3])
+        self.assertIn("server.py", scmd[1])
+        self.assertIn("--pidfile", scmd[3])
 
         pcmd, scmd = evennia_launcher._get_twistd_cmdline(True, True)
-        self.assertTrue("portal.py" in pcmd[1])
-        self.assertTrue("--pidfile" in pcmd[2])
-        self.assertTrue("--profiler=cprofile" in pcmd[4], "actual: {}".format(pcmd))
-        self.assertTrue("--profile=" in pcmd[5])
-        self.assertTrue("server.py" in scmd[1])
-        self.assertTrue("--pidfile" in scmd[2])
-        self.assertTrue("--pidfile" in scmd[2])
-        self.assertTrue("--profiler=cprofile" in scmd[4], "actual: {}".format(scmd))
-        self.assertTrue("--profile=" in scmd[5])
+        self.assertIn("portal.py", pcmd[1])
+        self.assertIn("--pidfile", pcmd[3])
+        self.assertIn("--profiler=cprofile", pcmd[5], pcmd)
+        self.assertIn("--profile=", pcmd[6])
+        self.assertIn("server.py", scmd[1])
+        self.assertIn("--pidfile", scmd[3])
+        self.assertIn("--pidfile", scmd[3])
+        self.assertIn("--profiler=cprofile", scmd[5], "actual: {}".format(scmd))
+        self.assertIn("--profile=", scmd[6])
 
     @patch("evennia.server.evennia_launcher.os.name", new="nt")
     def test_get_twisted_cmdline_nt(self):
         pcmd, scmd = evennia_launcher._get_twistd_cmdline(False, False)
-        self.assertTrue(len(pcmd) == 2, "actual: {}".format(pcmd))
-        self.assertTrue(len(scmd) == 2, "actual: {}".format(scmd))
+        self.assertTrue(len(pcmd) == 3, pcmd)
+        self.assertTrue(len(scmd) == 3, scmd)
 
     @patch("evennia.server.evennia_launcher.reactor.stop")
     def test_reactor_stop(self, mockstop):