diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index 5e8a73bb19..8af7fe59eb 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -1226,14 +1226,11 @@ class TestTurnBattleFunc(EvenniaTest):
         self.assertTrue(tb_range.get_range(attacker, defender) == 1)
         # Remove the script at the end
         turnhandler.stop()
-    
-"""
+        
     # Test functions in tb_items.
     def test_tbitemsfunc(self):
-        attacker = create_object(tb_items.TBItemsCharacter, key="Attacker")
-        tb_items.tickerhandler.remove(interval=30, callback=attacker.at_update, idstring="update")
-        defender = create_object(tb_items.TBItemsCharacter, key="Defender")
-        tb_items.tickerhandler.remove(interval=30, callback=defender.at_update, idstring="update")
+        attacker = create_object(tb_items.TBItemsCharacterTest, key="Attacker")
+        defender = create_object(tb_items.TBItemsCharacterTest, key="Defender")
         testroom = create_object(DefaultRoom, key="Test Room")
         attacker.location = testroom
         defender.loaction = testroom
@@ -1300,7 +1297,7 @@ class TestTurnBattleFunc(EvenniaTest):
         turnhandler.turn_end_check(attacker)
         self.assertTrue(turnhandler.db.turn == 1)
         # Join fight
-        joiner = create_object(tb_items.TBItemsCharacter, key="Joiner")
+        joiner = create_object(tb_items.TBItemsCharacterTest, key="Joiner")
         turnhandler.db.fighters = [attacker, defender]
         turnhandler.db.turn = 0
         turnhandler.join_fight(joiner)
@@ -1309,8 +1306,7 @@ class TestTurnBattleFunc(EvenniaTest):
         # Remove the script at the end
         turnhandler.stop()
         # Now time to test item stuff.
-        user = create_object(tb_items.TBItemsCharacter, key="User")
-        tb_items.tickerhandler.remove(interval=30, callback=user.at_update, idstring="update")
+        user = create_object(tb_items.TBItemsCharacterTest, key="User")
         testroom = create_object(DefaultRoom, key="Test Room")
         user.location = testroom
         test_healpotion = create_object(key="healing potion")
@@ -1343,7 +1339,6 @@ class TestTurnBattleFunc(EvenniaTest):
         self.assertTrue(user.db.conditions == {})
         # Delete the test character
         user.delete()
-"""
 
 # Test tree select