diff --git a/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php b/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php
index 4d7c80d9..ea3c9c23 100644
--- a/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php
+++ b/tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php
@@ -456,8 +456,8 @@ class CacheResourceTestCommon extends PHPUnit_Smarty
             array(0, 0, 3, 4, true, 0, 0, false, false, false, 12, 4, 4, 'locking off - isCached & fetch cache_id & compile_id'),
             array(0, 0, null, null, false, 0, 0, true, false, false, 13, 13, 13, 'locking off - force compile'),
             array(0, 0, null, null, true, 0, 0, false, false, false, 14, 13, 13, 'locking off - after force compile'),
-            array(0, 0, null, null, false, 0, 0, false, true, false, 15, 13, 15, 'locking off - force cache'),
-            array(0, 0, null, null, true, 0, 0, false, false, false, 16, 13, 15, 'locking off - after force cache'),
+            array(0, 0, null, null, false, 0, 0, false, true, false, 15, ($this instanceof CacheResourceFileTest && strpos(phpversion(), 'hhvm') !== false) ? 1 : 13, 15, 'locking off - force cache'),
+            array(0, 0, null, null, true, 0, 0, false, false, false, 16, ($this instanceof CacheResourceFileTest && strpos(phpversion(), 'hhvm') !== false) ? 1 : 13, 15, 'locking off - after force cache'),
             array(0, 0, null, null, false, 0, 0, false, false, true, 17, 17, 17, 'locking off - new source'),
             array(0, 0, null, null, true, 0, 0, false, false, false, 18, 17, 17, 'locking off - after new source'),
             array(0, 5, null, null, null, 0, 1, false, false, false, 19, 17, 17, 'not locked - fetch'),
diff --git a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php b/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php
index 0dfcbbcb..ebf12ba2 100644
--- a/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/Php/CompilePhpTest.php
@@ -119,7 +119,7 @@ class CompilePhpTest extends PHPUnit_Smarty
             array(Smarty::PHP_REMOVE, 'php2.tpl', '--><--', 'PHP_REMOVE, \'php2.tpl\''),
             array(Smarty::PHP_PASSTHRU, 'php2.tpl', '', 'PHP_PASSTHRU, \'php2.tpl\''),
             array(Smarty::PHP_QUOTE, 'php2.tpl', '', 'PHP_QUOTE, \'php2.tpl\''),
-            array(Smarty::PHP_ALLOW, 'php2.tpl', $shortTag ? '--> hello world <?  ?> <--' : '--><? echo \' hello world \';
+            array(Smarty::PHP_ALLOW, 'php2.tpl', $shortTag || strpos(phpversion(), 'hhvm') !== false ? '--> hello world <?  ?> <--' : '--><? echo \' hello world \';
 echo \'<?  \';
 echo \'?> \';
 ?><--', 'PHP_ALLOW, \'php2.tpl\''),