Index: tests/OFSPXSocketTests.m
==================================================================
--- tests/OFSPXSocketTests.m
+++ tests/OFSPXSocketTests.m
@@ -167,11 +167,11 @@
 		[[OFRunLoop mainRunLoop] runUntilDate:
 		    [OFDate dateWithTimeIntervalSinceNow: 2]];
 
 		TEST(@"-[asyncAccept] & -[asyncConnectToNetwork:node:port:]",
 		    delegate->_accepted && delegate->_connected)
-	} @catch (OFObserveFailedException *e) {
+	} @catch (OFObserveKernelEventsFailedException *e) {
 		switch (e.errNo) {
 		case ENOTSOCK:
 			[OFStdOut setForegroundColor: [OFColor lime]];
 			[OFStdOut writeLine:
 			    @"\r[OFSPXSocket] -[asyncAccept] & "

Index: tests/OFSPXStreamSocketTests.m
==================================================================
--- tests/OFSPXStreamSocketTests.m
+++ tests/OFSPXStreamSocketTests.m
@@ -171,11 +171,11 @@
 		[[OFRunLoop mainRunLoop] runUntilDate:
 		    [OFDate dateWithTimeIntervalSinceNow: 2]];
 
 		TEST(@"-[asyncAccept] & -[asyncConnectToNetwork:node:port:]",
 		    delegate->_accepted && delegate->_connected)
-	} @catch (OFObserveFailedException *e) {
+	} @catch (OFObserveKernelEventsFailedException *e) {
 		switch (e.errNo) {
 		case ENOTSOCK:
 			[OFStdOut setForegroundColor: [OFColor lime]];
 			[OFStdOut writeLine:
 			    @"\r[OFSPXStreamSocket] -[asyncAccept] & "