diff --git a/.travis.yml b/.travis.yml
index 4cf1965..d2e38eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ php:
   - 7.0
   - hhvm
 
+matrix:
+    allow_failures:
+        - php: hhvm
+
 before_script:
   - composer install --prefer-source --dev
 
diff --git a/composer.json b/composer.json
index bcf43b8..98682fe 100644
--- a/composer.json
+++ b/composer.json
@@ -9,15 +9,21 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.3.0",
+        "ext-pgsql": "*",
+        "doctrine/dbal": "2.*"
     },
     "require-dev": {
-        "doctrine/dbal": "*",
-        "phpunit/phpunit": "*"
+        "phpunit/phpunit": "4.*|5.*"
     },
     "autoload": {
-        "psr-0": {
-            "Doctrine\\DBAL\\PostgresTypes\\": "src/"
+        "psr-4": {
+            "Doctrine\\DBAL\\PostgresTypes\\": "src/Doctrine/DBAL/PostgresTypes"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
         }
     }
 }