diff --git a/.coveralls.yml b/.coveralls.yml
index 48e91dd..16f0040 100644
--- a/.coveralls.yml
+++ b/.coveralls.yml
@@ -2,7 +2,6 @@
 # Coveralls configuration
 #
 
-src_dir: src
 service_name: travis-ci
 coverage_clover: clover.xml
 json_path: coveralls-upload.json
diff --git a/.travis.yml b/.travis.yml
index c538b8e..9182149 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,19 +4,19 @@ php:
     - 5.4
     - 5.5
     - 5.6
+    - 7.0
     - hhvm
 
-matrix:
-  allow_failures:
-      - php: hhvm
+sudo: false
 
-before_script:
-    - composer self-update
-    - composer install --prefer-source -o
+install:
+    - travis_retry composer install --prefer-source --no-dev --no-interaction
 
 script:
-    - bin/phpunit --coverage-text --coverage-clover clover.xml
+    - phpunit --coverage-text --coverage-clover clover.xml
 
 after_script:
-    - bin/coveralls
+    - chmod +rwx clover.xml
+    - wget https://github.com/satooshi/php-coveralls/releases/download/v0.7.1/coveralls.phar
+    - php coveralls.phar
 
diff --git a/composer.json b/composer.json
index 9c64d41..33f9adc 100644
--- a/composer.json
+++ b/composer.json
@@ -19,10 +19,6 @@
         "source": "https://github.com/Wisembly/Totem"
     },
 
-	"replace": {
-		"taluu/totem": "self.version"
-	},
-
     "autoload": {
         "psr-4": {
             "Totem\\": ["src/", "test/"]
@@ -30,19 +26,7 @@
     },
 
     "require": {
-        "php": ">=5.4",
-        "symfony/property-access": "~2.5"
-    },
-
-    "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "satooshi/php-coveralls": "~0.6"
-    },
-
-    "config": {
-        "bin-dir": "bin"
-    },
-
-    "minimum-stability": "dev",
-    "prefer-stable": true
+        "php": "^5.4|^7.0",
+        "symfony/property-access": "^2.5|^3.0"
+    }
 }