diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a2fba09
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+/tests export-ignore
+/vendor export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.scrutinizer.yml export-ignore
+.travis.yml export-ignore
+phpunit.xml.dist export-ignore
diff --git a/.travis.yml b/.travis.yml
index 1113a90..6196e34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,29 @@
+sudo: false
+
 language: php
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+    - vendor
+
 php:
   - 5.5
   - 5.6
   - 7.0
 
+env:
+  matrix:
+    - PREFER_LOWEST="--prefer-lowest"
+    - PREFER_LOWEST=""
+
 before_script:
   - composer self-update
-  - composer install --dev --prefer-source
+  - composer update --prefer-source $PREFER_LOWEST
 
 script:
-  - phpunit
-  - ./vendor/bin/phpcs --standard=PSR2 ./src/
+  - vendor/bin/phpunit -c ./phpunit.xml.dist
+  - vendor/bin/phpcs --standard=PSR2 src
 
 notifications:
   irc: "irc.freenode.org#zftalk.modules"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfde896..0988806 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.6.0
+
+- [BC] Synchronize with SlmQueue release 0.6.0 which adds compatibility with PHP7, zend-servicemanager 3 and zend-eventmanager 3
+
 # 0.5.0
 
 - [BC] SlmQueueSqs is now based on AWS SDK v3. As a consequence, minimum PHP dependency has been bumped to 5.5.
diff --git a/composer.json b/composer.json
index 17b3c61..e961c0d 100644
--- a/composer.json
+++ b/composer.json
@@ -23,30 +23,28 @@
             "homepage": "http://www.michaelgallego.fr"
         }
     ],
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/basz/aws-sdk-php-zf2"
-        }
-    ],
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "require": {
         "php": "^5.5 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6 || ^3.0",
-        "zendframework/zend-servicemanager": "~2.7 || ^3.0",
-        "zendframework/zend-stdlib": "~2.2 || ^3.0",
-        "slm/queue": "dev-master as 0.6.0",
-        "aws/aws-sdk-php-zf2": "dev-zf-sm3-compatibility as 3.0.0"
+        "zendframework/zend-servicemanager": "^2.7 || ^3.0",
+        "zendframework/zend-stdlib": "^2.2 || ^3.0",
+        "slm/queue": "^0.6",
+        "aws/aws-sdk-php-zf2": "dev-master as 2.0.2"
     },
     "require-dev": {
-        "zendframework/zendframework": "~2.2",
-        "phpunit/phpunit": "~4.1",
-        "squizlabs/php_codesniffer": "2.*"
+        "zendframework/zend-config": "^2.2",
+        "zendframework/zend-modulemanager": "^2.5",
+        "zendframework/zend-view": "^2.5",
+        "zendframework/zend-log": "^2.5",
+        "zendframework/zend-i18n": "^2.5",
+        "zendframework/zend-serializer": "^2.5",
+        "zendframework/zend-mvc": "^2.5",
+        "phpunit/phpunit": "^4.8",
+        "squizlabs/php_codesniffer": "^2.1"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.5.0-dev"
+            "dev-master": "0.6.x-dev"
         }
     },
     "autoload": {
@@ -56,5 +54,10 @@
         "classmap": [
             "./Module.php"
         ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "SlmQueueSqsTest\\": "tests/"
+        }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml.dist
similarity index 68%
rename from phpunit.xml
rename to phpunit.xml.dist
index b8cae2b..ab8727e 100644
--- a/phpunit.xml
+++ b/phpunit.xml.dist
@@ -19,4 +19,11 @@
             <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
+
+    <logging>
+        <log type="coverage-clover" target="./tests/build/logs/clover.xml"/>
+        <log type="coverage-html" target="./tests/build/coverage" charset="UTF-8"
+             yui="true" highlight="true" lowUpperBound="90" highLowerBound="100"/>
+    </logging>
+
 </phpunit>
diff --git a/tests/.gitignore b/tests/.gitignore
index ba33e47..ce18082 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +1,2 @@
 TestConfiguration.php
+build