diff --git a/.travis.yml b/.travis.yml
index 8dc58e8ff..d48db6e16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,31 @@
 language: php
+sudo: required
+dist: xenial
 php:
   - 5.5
   - 5.6
-  - 7
-  - hhvm
+  - 7.0
+  - 7.1
+  - 7.2
+  - 7.3snapshot
 
-sudo: false
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: hhvm
-    - php: 7
+addons:
+  apt:
+    packages:
+      # required for php7.3
+      - libzip4
 
 script:
-  - phpunit --configuration tests/phpunit.xml
-  - ./bin/sabre-cs-fixer fix lib/ --dry-run --diff
+  - ./bin/phpunit --configuration tests/phpunit.xml
+  - ./bin/sabre-cs-fixer fix . --dry-run --diff
+
+before_script:
+  - composer install
 
-before_script: composer install
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+matrix:
+  allow_failures:
+    - php: 5.5
\ No newline at end of file
diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
index 1b651f342..6f99a8c15 100644
--- a/lib/Component/VCard.php
+++ b/lib/Component/VCard.php
@@ -476,7 +476,7 @@ function xmlSerialize(Xml\Writer $writer) {
                 switch ($property->name) {
 
                     case 'VERSION':
-                        continue;
+                        break;
 
                     case 'XML':
                         $value = $property->getParts();
diff --git a/lib/FreeBusyGenerator.php b/lib/FreeBusyGenerator.php
index 88b63eba9..3afaf5845 100644
--- a/lib/FreeBusyGenerator.php
+++ b/lib/FreeBusyGenerator.php
@@ -430,7 +430,7 @@ protected function calculateBusy(FreeBusyData $fbData, array $objects) {
                                 // instance. We are skipping this event from the output
                                 // entirely.
                                 unset($this->objects[$key]);
-                                continue;
+                                break;
                             }
 
                             if ($this->start) {
diff --git a/tests/VObject/BirthdayCalendarGeneratorTest.php b/tests/VObject/BirthdayCalendarGeneratorTest.php
index 1fc11803f..4d3e1881b 100644
--- a/tests/VObject/BirthdayCalendarGeneratorTest.php
+++ b/tests/VObject/BirthdayCalendarGeneratorTest.php
@@ -449,11 +449,11 @@ function testVcardStringWithEmptyBirthdayProperty() {
     function testParseException() {
 
         $generator = new BirthdayCalendarGenerator();
-        $input = <<<FOO
+        $input = <<<EOT
 BEGIN:FOO
 FOO:Bar
 END:FOO
-FOO;
+EOT;
 
         $generator->setObjects($input);