diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
index 9a0420e9..d41ec548 100644
--- a/Tests/LinuxMain.swift
+++ b/Tests/LinuxMain.swift
@@ -23,24 +23,24 @@ import XCTest
 ///
 
 #if os(Linux) || os(FreeBSD)
-   @testable import NIOHTTP1Tests
    @testable import NIOTests
+   @testable import NIOHTTP1Tests
 
    XCTMain([
-         testCase(HTTPHeadersTest.allTests),
-         testCase(HTTPTest.allTests),
-         testCase(CircularBufferTests.allTests),
          testCase(TypeAssistedChannelHandlerTest.allTests),
-         testCase(ByteBufferTest.allTests),
-         testCase(ChannelPipelineTest.allTests),
+         testCase(CircularBufferTests.allTests),
+         testCase(AdaptiveRecvByteBufferAllocatorTest.allTests),
+         testCase(EchoServerClientTest.allTests),
          testCase(ByteToMessageDecoderTest.allTests),
          testCase(MessageToByteEncoderTest.allTests),
-         testCase(EchoServerClientTest.allTests),
-         testCase(EmbeddedChannelTest.allTests),
-         testCase(EventLoopTest.allTests),
          testCase(FileRegionTest.allTests),
-         testCase(FutureTest.allTests),
-         testCase(AdaptiveRecvByteBufferAllocatorTest.allTests),
+         testCase(ByteBufferTest.allTests),
+         testCase(EmbeddedChannelTest.allTests),
+         testCase(ChannelPipelineTest.allTests),
          testCase(SocketAddressTest.allTests),
+         testCase(FutureTest.allTests),
+         testCase(EventLoopTest.allTests),
+         testCase(HTTPHeadersTest.allTests),
+         testCase(HTTPTest.allTests),
     ])
 #endif
\ No newline at end of file
diff --git a/Tests/NIOTests/EchoServerClientTest+XCTest.swift b/Tests/NIOTests/EchoServerClientTest+XCTest.swift
index 3ed263cb..eac081a1 100644
--- a/Tests/NIOTests/EchoServerClientTest+XCTest.swift
+++ b/Tests/NIOTests/EchoServerClientTest+XCTest.swift
@@ -27,6 +27,9 @@ extension EchoServerClientTest {
    static var allTests : [(String, (EchoServerClientTest) -> () throws -> Void)] {
       return [
                 ("testEcho", testEcho),
+                ("testChannelActiveOnConnect", testChannelActiveOnConnect),
+                ("testWriteThenRead", testWriteThenRead),
+                ("testCloseInInactive", testCloseInInactive),
            ]
    }
 }
diff --git a/Tests/NIOTests/EventLoopTest+XCTest.swift b/Tests/NIOTests/EventLoopTest+XCTest.swift
index c3ebd04c..55b3691e 100644
--- a/Tests/NIOTests/EventLoopTest+XCTest.swift
+++ b/Tests/NIOTests/EventLoopTest+XCTest.swift
@@ -27,6 +27,7 @@ extension EventLoopTest {
    static var allTests : [(String, (EventLoopTest) -> () throws -> Void)] {
       return [
                 ("testSchedule", testSchedule),
+                ("testScheduleCancelled", testScheduleCancelled),
            ]
    }
 }
diff --git a/Tests/NIOTests/FutureTest+XCTest.swift b/Tests/NIOTests/FutureTest+XCTest.swift
index e396fd29..70ec6000 100644
--- a/Tests/NIOTests/FutureTest+XCTest.swift
+++ b/Tests/NIOTests/FutureTest+XCTest.swift
@@ -28,6 +28,9 @@ extension FutureTest {
       return [
                 ("testFutureFulfilledIfHasResult", testFutureFulfilledIfHasResult),
                 ("testFutureFulfilledIfHasError", testFutureFulfilledIfHasError),
+                ("testAndAllWithAllSuccesses", testAndAllWithAllSuccesses),
+                ("testAndAllWithAllFailures", testAndAllWithAllFailures),
+                ("testAndAllWithOneFailure", testAndAllWithOneFailure),
            ]
    }
 }