diff --git a/.eslintignore b/.eslintignore
index 3091757a3..545beddcd 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,5 @@
 node_modules
-coverage
\ No newline at end of file
+coverage
+*.md
+*.yml
+*.json
diff --git a/.travis.yml b/.travis.yml
index 14d84d554..c6cd7326a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ branches:
     - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
 env:
   global:
-    - DOCKER_COMPOSE_VERSION=1.16.1
+    - DOCKER_COMPOSE_VERSION=1.22.0
     - COMPOSE_FILE=docker-compose.0_11.yml
     - KAFKA_VERSION=0.11
 before_install:
diff --git a/docker-compose.0_10.yml b/docker-compose.0_10.yml
index f02a609ae..5fd97feaa 100644
--- a/docker-compose.0_10.yml
+++ b/docker-compose.0_10.yml
@@ -9,6 +9,9 @@ services:
     volumes:
       - ./testHelpers/kafka/server-jaas.conf:/etc/kafka/server-jaas.conf
   kafka1:
+    labels:
+      - "custom.project=kafkajs"
+      - "custom.service=kafka1"
     image: wurstmeister/kafka:0.10.2.1
     ports:
       - "9092:9092"
@@ -39,6 +42,9 @@ services:
       - ./testHelpers/kafka/server-jaas.conf:/opt/kafka/config/server-jaas.conf
       # - ./testHelpers/kafka/log4j.properties:/opt/kafka/config/log4j.properties
   kafka2:
+    labels:
+      - "custom.project=kafkajs"
+      - "custom.service=kafka2"
     image: wurstmeister/kafka:0.10.2.1
     ports:
       - "9095:9095"
@@ -69,6 +75,9 @@ services:
       - ./testHelpers/kafka/server-jaas.conf:/opt/kafka/config/server-jaas.conf
       # - ./testHelpers/kafka/log4j.properties:/opt/kafka/config/log4j.properties
   kafka3:
+    labels:
+      - "custom.project=kafkajs"
+      - "custom.service=kafka3"
     image: wurstmeister/kafka:0.10.2.1
     ports:
       - "9098:9098"
diff --git a/docker-compose.0_11.yml b/docker-compose.0_11.yml
index 038005002..1332636b3 100644
--- a/docker-compose.0_11.yml
+++ b/docker-compose.0_11.yml
@@ -9,6 +9,9 @@ services:
     volumes:
       - ./testHelpers/kafka/server-jaas.conf:/etc/kafka/server-jaas.conf
   kafka1:
+    labels:
+      - "custom.project=kafkajs"
+      - "custom.service=kafka1"
     image: wurstmeister/kafka:2.11-0.11.0.2
     ports:
       - "9092:9092"
@@ -40,6 +43,9 @@ services:
       - ./testHelpers/kafka/server-jaas.conf:/opt/kafka/config/server-jaas.conf
       # - ./testHelpers/kafka/log4j.properties:/opt/kafka/config/log4j.properties
   kafka2:
+    labels:
+      - "custom.project=kafkajs"
+      - "custom.service=kafka2"
     image: wurstmeister/kafka:2.11-0.11.0.2
     ports:
       - "9095:9095"
@@ -71,6 +77,9 @@ services:
       - ./testHelpers/kafka/server-jaas.conf:/opt/kafka/config/server-jaas.conf
       # - ./testHelpers/kafka/log4j.properties:/opt/kafka/config/log4j.properties
   kafka3:
+    labels:
+      - "custom.project=kafkajs"
+      - "custom.service=kafka3"    
     image: wurstmeister/kafka:2.11-0.11.0.2
     ports:
       - "9098:9098"
diff --git a/package.json b/package.json
index fa738817e..b853f0485 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
   },
   "homepage": "https://github.com/tulios/kafkajs",
   "scripts": {
-    "test:local": "KAFKA_VERSION=0.11 NODE_ENV=test ./node_modules/.bin/jest --forceExit --detectOpenHandles",
-    "test:debug": "NODE_ENV=test  node --inspect-brk node_modules/.bin/jest --detectOpenHandles --runInBand --watch",
+    "test:local": "export KAFKA_VERSION=${KAFKA_VERSION:='0.11'} && NODE_ENV=test echo \"KAFKA_VERSION: ${KAFKA_VERSION}\" && ./node_modules/.bin/jest --forceExit --detectOpenHandles",
+    "test:debug": "NODE_ENV=test node --inspect-brk node_modules/.bin/jest --detectOpenHandles --runInBand --watch",
     "test:local:watch": "yarn test:local --watch",
     "test": "yarn lint && JEST_JUNIT_OUTPUT=test-report.xml ./scripts/testWithKafka.sh 'yarn test:local --ci --maxWorkers=4 --no-watchman'",
     "lint": "find . -path ./node_modules -prune -o -path ./coverage -prune -o -name '*.js' -print0 | xargs -0 ./node_modules/.bin/eslint",
diff --git a/scripts/testWithKafka.sh b/scripts/testWithKafka.sh
index 16e91f50c..563ae8673 100755
--- a/scripts/testWithKafka.sh
+++ b/scripts/testWithKafka.sh
@@ -9,8 +9,8 @@ export COMPOSE_FILE=${COMPOSE_FILE:="docker-compose.0_11.yml"}
 find_container_id() {
   echo $(docker ps \
     --filter "status=running" \
-    --filter "label=com.docker.compose.project=kafkajs" \
-    --filter "label=com.docker.compose.service=kafka1" \
+    --filter "label=custom.project=kafkajs" \
+    --filter "label=custom.service=kafka1" \
     --no-trunc \
     -q)
 }
diff --git a/scripts/waitForKafka.js b/scripts/waitForKafka.js
index f0d53d82b..ff1345bfc 100755
--- a/scripts/waitForKafka.js
+++ b/scripts/waitForKafka.js
@@ -9,8 +9,8 @@ const findContainerId = node => {
   const cmd = `
     docker ps \
       --filter "status=running" \
-      --filter "label=com.docker.compose.project=kafkajs" \
-      --filter "label=com.docker.compose.service=${node}" \
+      --filter "label=custom.project=kafkajs" \
+      --filter "label=custom.service=${node}" \
       --no-trunc \
       -q
   `
diff --git a/src/broker/__tests__/metadata.spec.js b/src/broker/__tests__/metadata.spec.js
index 487f2dce2..b844f1844 100644
--- a/src/broker/__tests__/metadata.spec.js
+++ b/src/broker/__tests__/metadata.spec.js
@@ -5,6 +5,7 @@ const {
   newLogger,
   createTopic,
   retryProtocol,
+  testIfKafka011,
 } = require('testHelpers')
 
 describe('Broker > Metadata', () => {
@@ -76,7 +77,7 @@ describe('Broker > Metadata', () => {
       })
     })
 
-    it('returns UNKNOWN_TOPIC_OR_PARTITION', async () => {
+    testIfKafka011('returns UNKNOWN_TOPIC_OR_PARTITION', async () => {
       await broker.connect()
 
       await expect(broker.metadata([topicName])).rejects.toHaveProperty(