diff --git a/classes.py b/classes.py
index 8e17667..3a035d6 100644
--- a/classes.py
+++ b/classes.py
@@ -67,17 +67,18 @@ testconf = {'bot':
                     'realname': 'PyLink Service Client',
                     'loglevel': 'DEBUG',
                 },
-            'server':
-                {
-                    'netname': 'fakeirc',
-                    'ip': '0.0.0.0',
-                    'port': 7000,
-                    'recvpass': "abcd",
-                    'sendpass': "abcd",
-                    'protocol': "null",
-                    'hostname': "pylink.unittest",
-                    'sid': "9PY",
-                    'channels': ["#pylink"],
+            'servers':
+                {'unittest':
+                    {
+                        'ip': '0.0.0.0',
+                        'port': 7000,
+                        'recvpass': "abcd",
+                        'sendpass': "abcd",
+                        'protocol': "null",
+                        'hostname': "pylink.unittest",
+                        'sid': "9PY",
+                        'channels': ["#pylink"],
+                    },
                 },
            }
 
diff --git a/tests/test_fakeirc.py b/tests/test_fakeirc.py
index 4a640a4..95bc800 100644
--- a/tests/test_fakeirc.py
+++ b/tests/test_fakeirc.py
@@ -9,7 +9,7 @@ import unittest
 # Yes, we're going to even test the testing classes. Testception? I think so.
 class TestFakeIRC(unittest.TestCase):
     def setUp(self):
-        self.irc = classes.FakeIRC(classes.FakeProto(), classes.testconf)
+        self.irc = classes.FakeIRC('unittest', classes.FakeProto(), classes.testconf)
 
     def testFakeIRC(self):
         self.irc.run('this should do nothing')
diff --git a/tests/test_proto_inspircd.py b/tests/test_proto_inspircd.py
index f17ed7c..5f9eb6c 100644
--- a/tests/test_proto_inspircd.py
+++ b/tests/test_proto_inspircd.py
@@ -11,7 +11,7 @@ import utils
 
 class TestProtoInspIRCd(unittest.TestCase):
     def setUp(self):
-        self.irc = classes.FakeIRC(inspircd, classes.testconf)
+        self.irc = classes.FakeIRC('unittest', inspircd, classes.testconf)
         self.proto = self.irc.proto
         self.sdata = self.irc.serverdata
         # This is to initialize ourself as an internal PseudoServer, so we can spawn clients