diff --git a/evennia/server/tests/test_amp_connection.py b/evennia/server/tests/test_amp_connection.py
index 7161ea72de..9c0ea83f1a 100644
--- a/evennia/server/tests/test_amp_connection.py
+++ b/evennia/server/tests/test_amp_connection.py
@@ -4,6 +4,7 @@ Test AMP client
 """
 
 import pickle
+from model_mommy import mommy
 from unittest import TestCase
 from mock import MagicMock, patch
 from twisted.trial.unittest import TestCase as TwistedTestCase
@@ -18,12 +19,13 @@ from evennia.utils import create
 from twisted.internet.base import DelayedCall
 DelayedCall.debug = True
 
-@patch("evennia.server.initial_setup.get_god_account",
-       MagicMock(return_value=create.account("TestAMPAccount", "test@test.com", "testpassword")))
+# @patch("evennia.server.initial_setup.get_god_account",
+#        MagicMock(return_value=create.account("TestAMPAccount", "test@test.com", "testpassword")))
 class _TestAMP(TwistedTestCase):
 
     def setUp(self):
         super(_TestAMP, self).setUp()
+        self.account = mommy.make("accounts.AccountDB", id=1)
         self.server = server.Evennia(MagicMock())
         self.server.sessions.data_in = MagicMock()
         self.server.sessions.data_out = MagicMock()
diff --git a/requirements.txt b/requirements.txt
index 9660a2e264..4d7088c2bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,7 @@ future >= 0.15.2
 django-sekizai
 inflect
 autobahn >= 17.9.3
+model_mommy
 
 # testing
 mock >= 1.0.1
diff --git a/win_requirements.txt b/win_requirements.txt
index 3402b8e242..310b399e08 100644
--- a/win_requirements.txt
+++ b/win_requirements.txt
@@ -12,6 +12,7 @@ future >= 0.15.2
 django-sekizai
 autobahn >= 17.9.3
 inflect
+model_mommy
 
 # testing
 mock >= 1.0.1