diff --git a/test/Twig/Tests/LexerTest.php b/test/Twig/Tests/LexerTest.php
index 97df3e5ed..c4d708312 100644
--- a/test/Twig/Tests/LexerTest.php
+++ b/test/Twig/Tests/LexerTest.php
@@ -140,10 +140,6 @@ class Twig_Tests_LexerTest extends PHPUnit_Framework_TestCase
 
     public function testBigNumbers()
     {
-        if ('hiphop' === substr(PHP_VERSION, -6)) {
-            $this->markTestSkipped('hhvm thinks that the number is actually a T_CONSTANT_ENCAPSED_STRING!');
-        }
-
         $template = '{{ 922337203685477580700 }}';
 
         $lexer = new Twig_Lexer(new Twig_Environment());
diff --git a/test/Twig/Tests/NativeExtensionTest.php b/test/Twig/Tests/NativeExtensionTest.php
index 9519bdf4a..7de268c65 100644
--- a/test/Twig/Tests/NativeExtensionTest.php
+++ b/test/Twig/Tests/NativeExtensionTest.php
@@ -23,7 +23,7 @@ class Twig_Tests_NativeExtensionTest extends PHPUnit_Framework_TestCase
         $d2 = new DateTime();
         $output = $twig->render('{{ d1.date }}{{ d2.date }}', compact('d1', 'd2'));
 
-        if ('hiphop' === substr(PHP_VERSION, -6)) {
+        if (defined('HHVM_VERSION')) {
             $this->markTestSkipped('Skip under HHVM as the behavior is not the same as plain PHP (which is an edge case anyway)');
         }