diff --git a/endpoint.py b/endpoint.py
index 4087e8a1..85220d6d 100644
--- a/endpoint.py
+++ b/endpoint.py
@@ -350,7 +350,7 @@ def _process_sendqueue(self):
                 self._dispersy.statistics.cur_sendqueue = len(self._sendqueue)
 
 
-class ManualEnpoint(StandaloneEndpoint):
+class ManualEndpoint(StandaloneEndpoint):
 
     def __init__(self, *args, **kwargs):
         StandaloneEndpoint.__init__(self, *args, **kwargs)
diff --git a/tests/dispersytestclass.py b/tests/dispersytestclass.py
index b63935b6..cca505d0 100644
--- a/tests/dispersytestclass.py
+++ b/tests/dispersytestclass.py
@@ -10,7 +10,7 @@
 
 from ..discovery.community import PEERCACHE_FILENAME
 from ..dispersy import Dispersy
-from ..endpoint import ManualEnpoint
+from ..endpoint import ManualEndpoint
 from ..util import blocking_call_on_reactor_thread
 from .debugcommunity.community import DebugCommunity
 from .debugcommunity.node import DebugNode
@@ -123,7 +123,7 @@ def create_nodes(self, amount=1, store_identity=True, tunnel=False, community_cl
             memory_database_argument = {'database_filename': u":memory:"} if memory_database else {}
             working_directory = unicode(mkdtemp(suffix="_dispersy_test_session"))
 
-            dispersy = Dispersy(ManualEnpoint(0), working_directory, **memory_database_argument)
+            dispersy = Dispersy(ManualEndpoint(0), working_directory, **memory_database_argument)
             dispersy.start(autoload_discovery=autoload_discovery)
 
             self.dispersy_objects.append(dispersy)