diff --git a/autotest-hhvm.sh b/autotest-hhvm.sh
deleted file mode 100755
index 6f3645c3ae..0000000000
--- a/autotest-hhvm.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-HERE=$(dirname "$0")
-PHP_EXE=hhvm "$HERE/autotest.sh" "$@"
diff --git a/autotest.sh b/autotest.sh
index 8958121a5b..f0ceca62b4 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -22,7 +22,7 @@ BASEDIR=$PWD
 PRIMARY_STORAGE_CONFIGS="local swift"
 DBCONFIGS="sqlite mysql mariadb pgsql oci mysqlmb4"
 
-# $PHP_EXE is run through 'which' and as such e.g. 'php' or 'hhvm' is usually
+# $PHP_EXE is run through 'which' and as such e.g. 'php' is usually
 # sufficient. Due to the behaviour of 'which', $PHP_EXE may also be a path
 # (absolute or not) to an executable, e.g. ./code/projects/php-src/sapi/cli/php.
 if [ -z "$PHP_EXE" ]; then
diff --git a/build/files-checker.php b/build/files-checker.php
index 9fa84b58a2..ba9761fe4d 100644
--- a/build/files-checker.php
+++ b/build/files-checker.php
@@ -42,7 +42,6 @@ $expectedFiles = [
 	'AUTHORS',
 	'autotest-checkers.sh',
 	'autotest-external.sh',
-	'autotest-hhvm.sh',
 	'autotest-js.sh',
 	'autotest.sh',
 	'bower.json',
diff --git a/tests/lib/Files/Storage/Wrapper/QuotaTest.php b/tests/lib/Files/Storage/Wrapper/QuotaTest.php
index 546ab69ef6..adfd60d053 100644
--- a/tests/lib/Files/Storage/Wrapper/QuotaTest.php
+++ b/tests/lib/Files/Storage/Wrapper/QuotaTest.php
@@ -179,7 +179,7 @@ class QuotaTest extends \Test\Files\Storage\Storage {
 		$instance = $this->getLimitedStorage(9);
 		$stream = $instance->fopen('files/foo', 'w+');
 		$meta = stream_get_meta_data($stream);
-		$expected_type = defined('HHVM_VERSION') ? 'File' : 'user-space';
+		$expected_type = 'user-space';
 		$this->assertEquals($expected_type, $meta['wrapper_type']);
 		fclose($stream);
 	}