diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b9a60e6..24be238 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,8 +1,10 @@
 <?php
 include __DIR__ . '/../vendor/autoload.php'; // composer autoload
 
-$kernel = \AspectMock\Kernel::getInstance();
-$kernel->init([
-    'debug' => true,
-    'includePaths' => [__DIR__ . '/../src/Generator']
-]);
+if (!defined('HHVM_VERSION')) {
+    $kernel = \AspectMock\Kernel::getInstance();
+    $kernel->init([
+        'debug' => true,
+        'includePaths' => [__DIR__ . '/../src/Generator']
+    ]);
+}
\ No newline at end of file
diff --git a/tests/src/TestCase.php b/tests/src/TestCase.php
index d17abdb..2aaa085 100644
--- a/tests/src/TestCase.php
+++ b/tests/src/TestCase.php
@@ -51,7 +51,7 @@ class TestCase extends \PHPUnit_Framework_TestCase
 
     protected function skipIfHhvm()
     {
-        if (getenv('PHP_VERSION') === 'hhvm') {
+        if (defined('HHVM_VERSION')) {
             $this->markTestSkipped('Skipping test that cannot run on HHVM');
         }
     }