diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index 1678d06567..20a24eb177 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -907,7 +907,7 @@ class TestTutorialWorldRooms(CommandTest):
 
 
 # test turnbattle
-from evennia.contrib import turnbattle
+from evennia.contrib.turnbattle import tb_basic
 from evennia.objects.objects import DefaultRoom
 
 
@@ -915,60 +915,59 @@ class TestTurnBattleCmd(CommandTest):
 
     # Test combat commands
     def test_turnbattlecmd(self):
-        self.call(turnbattle.CmdFight(), "", "You can't start a fight if you've been defeated!")
-        self.call(turnbattle.CmdAttack(), "", "You can only do that in combat. (see: help fight)")
-        self.call(turnbattle.CmdPass(), "", "You can only do that in combat. (see: help fight)")
-        self.call(turnbattle.CmdDisengage(), "", "You can only do that in combat. (see: help fight)")
-        self.call(turnbattle.CmdRest(), "", "Char rests to recover HP.")
-
+        self.call(tb_basic.CmdFight(), "", "You can't start a fight if you've been defeated!")
+        self.call(tb_basic.CmdAttack(), "", "You can only do that in combat. (see: help fight)")
+        self.call(tb_basic.CmdPass(), "", "You can only do that in combat. (see: help fight)")
+        self.call(tb_basic.CmdDisengage(), "", "You can only do that in combat. (see: help fight)")
+        self.call(tb_basic.CmdRest(), "", "Char rests to recover HP.")
 
 class TestTurnBattleFunc(EvenniaTest):
 
     # Test combat functions
     def test_turnbattlefunc(self):
-        attacker = create_object(turnbattle.BattleCharacter, key="Attacker")
-        defender = create_object(turnbattle.BattleCharacter, key="Defender")
+        attacker = create_object(tb_basic.BattleCharacter, key="Attacker")
+        defender = create_object(tb_basic.BattleCharacter, key="Defender")
         testroom = create_object(DefaultRoom, key="Test Room")
         attacker.location = testroom
         defender.loaction = testroom
         # Initiative roll
-        initiative = turnbattle.roll_init(attacker)
+        initiative = tb_basic.roll_init(attacker)
         self.assertTrue(initiative >= 0 and initiative <= 1000)
         # Attack roll
-        attack_roll = turnbattle.get_attack(attacker, defender)
+        attack_roll = tb_basic.get_attack(attacker, defender)
         self.assertTrue(attack_roll >= 0 and attack_roll <= 100)
         # Defense roll
-        defense_roll = turnbattle.get_defense(attacker, defender)
+        defense_roll = tb_basic.get_defense(attacker, defender)
         self.assertTrue(defense_roll == 50)
         # Damage roll
-        damage_roll = turnbattle.get_damage(attacker, defender)
+        damage_roll = tb_basic.get_damage(attacker, defender)
         self.assertTrue(damage_roll >= 15 and damage_roll <= 25)
         # Apply damage
         defender.db.hp = 10
-        turnbattle.apply_damage(defender, 3)
+        tb_basic.apply_damage(defender, 3)
         self.assertTrue(defender.db.hp == 7)
         # Resolve attack
         defender.db.hp = 40
-        turnbattle.resolve_attack(attacker, defender, attack_value=20, defense_value=10)
+        tb_basic.resolve_attack(attacker, defender, attack_value=20, defense_value=10)
         self.assertTrue(defender.db.hp < 40)
         # Combat cleanup
         attacker.db.Combat_attribute = True
-        turnbattle.combat_cleanup(attacker)
+        tb_basic.combat_cleanup(attacker)
         self.assertFalse(attacker.db.combat_attribute)
         # Is in combat
-        self.assertFalse(turnbattle.is_in_combat(attacker))
+        self.assertFalse(tb_basic.is_in_combat(attacker))
         # Set up turn handler script for further tests
-        attacker.location.scripts.add(turnbattle.TurnHandler)
+        attacker.location.scripts.add(tb_basic.TurnHandler)
         turnhandler = attacker.db.combat_TurnHandler
         self.assertTrue(attacker.db.combat_TurnHandler)
         # Force turn order
         turnhandler.db.fighters = [attacker, defender]
         turnhandler.db.turn = 0
         # Test is turn
-        self.assertTrue(turnbattle.is_turn(attacker))
+        self.assertTrue(tb_basic.is_turn(attacker))
         # Spend actions
         attacker.db.Combat_ActionsLeft = 1
-        turnbattle.spend_action(attacker, 1, action_name="Test")
+        tb_basic.spend_action(attacker, 1, action_name="Test")
         self.assertTrue(attacker.db.Combat_ActionsLeft == 0)
         self.assertTrue(attacker.db.Combat_LastAction == "Test")
         # Initialize for combat
@@ -992,7 +991,7 @@ class TestTurnBattleFunc(EvenniaTest):
         turnhandler.turn_end_check(attacker)
         self.assertTrue(turnhandler.db.turn == 1)
         # Join fight
-        joiner = create_object(turnbattle.BattleCharacter, key="Joiner")
+        joiner = create_object(tb_basic.BattleCharacter, key="Joiner")
         turnhandler.db.fighters = [attacker, defender]
         turnhandler.db.turn = 0
         turnhandler.join_fight(joiner)
@@ -1001,7 +1000,6 @@ class TestTurnBattleFunc(EvenniaTest):
         # Remove the script at the end
         turnhandler.stop()
 
-
 # Test of the unixcommand module
 
 from evennia.contrib.unixcommand import UnixCommand