diff --git a/tests/Test_Arguments.php b/tests/Test_Arguments.php
index 52b81e9..9f89eda 100644
--- a/tests/Test_Arguments.php
+++ b/tests/Test_Arguments.php
@@ -1,5 +1,6 @@
 <?php
 
+use cli\Arguments;
 use WP_CLI\Tests\TestCase;
 
 /**
diff --git a/tests/Test_Shell.php b/tests/Test_Shell.php
index 3e5e2bf..d2bc71e 100644
--- a/tests/Test_Shell.php
+++ b/tests/Test_Shell.php
@@ -1,5 +1,6 @@
 <?php
 
+use cli\Shell;
 use WP_CLI\Tests\TestCase;
 
 /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index ccf6762..8dedfd7 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -16,7 +16,7 @@ function cli_autoload( $className ) {
 		return;
 	}
 
-	require dirname( dirname( __FILE__ ) ) . '/lib/' . $fileName;
+	require dirname( __DIR__ ) . '/lib/' . $fileName;
 }
 
 spl_autoload_register( 'cli_autoload' );