diff --git a/.travis.yml b/.travis.yml
index 7da86f9..87e87ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,14 @@ language: php
 php:
   - "5.6"
   - "7.0"
-  - "hhvm"
+  - "7.1"
 
 before_script:
   - composer install
-  
 
 script: 
   - bin/phpunit --coverage-text
 
-matrix:
-     allow_failures:
-         - php: "hhvm"
 branches:
   only:
     - master
diff --git a/src/Mapping/serialization_hhvm.php b/src/Mapping/serialization_hhvm.php
deleted file mode 100644
index a07ee30..0000000
--- a/src/Mapping/serialization_hhvm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-    'DateInterval' => '\NilPortugues\Serializer\Serializer\InternalClasses\DateIntervalSerializer::serialize',
-    'DateTimeZone' => '\NilPortugues\Serializer\Serializer\InternalClasses\DateTimeZoneSerializer::serialize',
-    'DateTimeImmutable' => '\NilPortugues\Serializer\Serializer\HHVM\DateTimeImmutableSerializer::serialize',
-];
diff --git a/src/Mapping/unserialization_hhvm.php b/src/Mapping/unserialization_hhvm.php
deleted file mode 100644
index cee0625..0000000
--- a/src/Mapping/unserialization_hhvm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'DateInterval' => '\NilPortugues\Serializer\Serializer\InternalClasses\DateIntervalSerializer::unserialize',
-    'DateTimeZone' => '\NilPortugues\Serializer\Serializer\InternalClasses\DateTimeZoneSerializer::unserialize',
-    'DateTimeImmutable' => '\NilPortugues\Serializer\Serializer\HHVM\DateTimeImmutableSerializer::unserialize',
-    'DateTime' => '\NilPortugues\Serializer\Serializer\HHVM\DateTimeSerializer::unserialize',
-];
diff --git a/src/Serializer.php b/src/Serializer.php
index 4e9ae34..2556ca3 100644
--- a/src/Serializer.php
+++ b/src/Serializer.php
@@ -62,11 +62,6 @@ class Serializer
         'string' => 'serializeScalar',
     ];
 
-    /**
-     * @var bool
-     */
-    protected $isHHVM;
-
     /**
      * Hack specific serialization classes.
      *
@@ -79,16 +74,7 @@ class Serializer
      */
     public function __construct(StrategyInterface $strategy)
     {
-        $this->isHHVM = \defined('HHVM_VERSION');
-        if ($this->isHHVM) {
-            // @codeCoverageIgnoreStart
-            $this->serializationMap = \array_merge(
-                $this->serializationMap,
-                include \realpath(\dirname(__FILE__).'/Mapping/serialization_hhvm.php')
-            );
-            $this->unserializationMapHHVM = include \realpath(\dirname(__FILE__).'/Mapping/unserialization_hhvm.php');
-            // @codeCoverageIgnoreEnd
-        }
+
         $this->serializationStrategy = $strategy;
     }
 
@@ -142,12 +128,6 @@ protected function serializeData($value)
     {
         $this->guardForUnsupportedValues($value);
 
-        if ($this->isHHVM && ($value instanceof \DateTimeZone || $value instanceof \DateInterval)) {
-            // @codeCoverageIgnoreStart
-            return \call_user_func_array($this->serializationMap[get_class($value)], [$this, $value]);
-            // @codeCoverageIgnoreEnd
-        }
-
         if ($this->isInstanceOf($value, 'SplFixedArray')) {
             return SplFixedArraySerializer::serialize($this, $value);
         }
@@ -313,15 +293,6 @@ protected function unserializeDateTimeFamilyObject(array $value, $className)
         $obj = null;
 
         if ($this->isDateTimeFamilyObject($className)) {
-            if ($this->isHHVM) {
-                // @codeCoverageIgnoreStart
-                return \call_user_func_array(
-                    $this->unserializationMapHHVM[$className],
-                    [$this, $className, $value]
-                );
-                // @codeCoverageIgnoreEnd
-            }
-
             $obj = $this->restoreUsingUnserialize($className, $value);
             self::$objectMapping[self::$objectMappingIndex++] = $obj;
         }