diff --git a/composer.json b/composer.json
index 379b182cf..f425eec6f 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "wp-cli/wp-cli": "^2.5"
     },
     "require-dev": {
-        "wp-cli/wp-cli-tests": "^3.1"
+        "wp-cli/wp-cli-tests": "^4"
     },
     "config": {
         "process-timeout": 7200,
diff --git a/shell-command.php b/shell-command.php
index a8c52fb6e..e3098d49c 100644
--- a/shell-command.php
+++ b/shell-command.php
@@ -4,7 +4,7 @@
 	return;
 }
 
-$wpcli_shell_autoloader = dirname( __FILE__ ) . '/vendor/autoload.php';
+$wpcli_shell_autoloader = __DIR__ . '/vendor/autoload.php';
 if ( file_exists( $wpcli_shell_autoloader ) ) {
 	require_once $wpcli_shell_autoloader;
 }
diff --git a/src/WP_CLI/Shell/REPL.php b/src/WP_CLI/Shell/REPL.php
index f08711d70..f0719ca58 100644
--- a/src/WP_CLI/Shell/REPL.php
+++ b/src/WP_CLI/Shell/REPL.php
@@ -149,4 +149,3 @@ private static function starts_with( $tokens, $line ) {
 		return preg_match( "/^($tokens)[\(\s]+/", $line );
 	}
 }
-