diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
index 856fa9a..436ce57 100644
--- a/.kitchen.dokken.yml
+++ b/.kitchen.dokken.yml
@@ -13,12 +13,10 @@ provisioner:
 
 verifier:
   name: inspec
+  root_path: '/opt/verifier' # Needed for the specs to be detected in Docker
+  chef_license: accept
 
 platforms:
-  - name: ubuntu-16.04
-    driver:
-      image: dokken/ubuntu-16.04
-      pid_one_command: /bin/systemd
   - name: ubuntu-18.04
     driver:
       image: dokken/ubuntu-18.04
@@ -33,8 +31,3 @@ suites:
     run_list:
       - recipe[ipfs::default]
     attributes:
-  - name: cluster
-    run_list:
-      - recipe[ipfs::cluster]
-      - recipe[ipfs::cluster_service]
-    attributes:
diff --git a/.kitchen.yml b/.kitchen.yml
index 5c9425c..a14a206 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -6,17 +6,14 @@ provisioner:
   name: chef_zero
 
 platforms:
-  - name: ubuntu-16.04
   - name: ubuntu-18.04
   - name: debian-9
 
+verifier:
+  chef_license: accept
+
 suites:
   - name: default
     run_list:
       - recipe[ipfs::default]
     attributes:
-  - name: cluster
-    run_list:
-      - recipe[ipfs::cluster]
-      - recipe[ipfs::cluster_service]
-    attributes:
diff --git a/.travis.yml b/.travis.yml
index c581c93..10fb3d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,6 @@ services: docker
 env:
   matrix:
   - INSTANCE=default-debian-9
-  - INSTANCE=default-ubuntu-1604
   - INSTANCE=default-ubuntu-1804
 
 before_script:
@@ -30,7 +29,7 @@ before_script:
   - cookstyle --version
   - foodcritic --version
 
-script: CHEF_LICENSE=accept-no-persist KITCHEN_LOCAL_YAML=.kitchen.dokken.yml CHEF_VERSION=13.10.4 kitchen verify ${INSTANCE}
+script: CHEF_LICENSE=accept-no-persist KITCHEN_LOCAL_YAML=.kitchen.dokken.yml kitchen test ${INSTANCE}
 
 matrix:
   include:
diff --git a/test/integration/default/serverspec/ipfs_spec.rb b/test/integration/default/serverspec/ipfs_spec.rb
index 48cb2b4..2c6b9c5 100644
--- a/test/integration/default/serverspec/ipfs_spec.rb
+++ b/test/integration/default/serverspec/ipfs_spec.rb
@@ -45,10 +45,7 @@ describe 'IPFS' do
 
   {
     'Swarm.AddrFilters' => addr_filters.rstrip,
-    'Swarm.DisableBandwidthMetrics' => true,
-    'Swarm.DisableRelay' => true,
-    'Swarm.ConnMgr.HighWater' => 10,
-    'Swarm.ConnMgr.LowWater' => 1,
+    'Gateway.Writable' => true,
   }.each do |k, v|
     describe command("IPFS_PATH=/home/ipfs/.ipfs ipfs config '#{k}'") do
       let(:sudo_options) { '-u ipfs -i' }