diff --git a/.travis.yml b/.travis.yml
index 94f019a..f53f15a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
+sudo: false
 language: php
 php:
-  - 5.5
   - 5.6
   - hhvm
   - nightly
diff --git a/Tests/Tests.php b/Tests/Tests.php
index d02b008..ab62cdc 100644
--- a/Tests/Tests.php
+++ b/Tests/Tests.php
@@ -45,13 +45,18 @@
 		private $Socket;
 		private $SourceQuery;
 		
-		public function setUpBeforeClass()
+		public function setUp()
 		{
 			$this->Socket = new TestableSocket();
 			$this->SourceQuery = new SourceQuery( $this->Socket );
 			$this->SourceQuery->Connect( 1, 2 );
 		}
 		
+		public function tearDown()
+		{
+			$this->SourceQuery->Disconnect();
+		}
+		
 		/**
 		 * @dataProvider InfoProvider
 		 */