diff --git a/.circleci/config.yml b/.circleci/config.yml
index f745a50..cfb4178 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,9 @@
-version: '2'
+---
+version: 2.1
 jobs:
   build:
     docker:
-      - image: ubuntu:yakkety
+      - image: ubuntu:18.04
     working_directory: ~/code
     steps:
       - setup_remote_docker
@@ -10,17 +11,17 @@ jobs:
           name: Install Docker client
           command: |
             set -x
-            VER="17.03.0-ce"
+            VER="18.09.6"
             apt-get update -q
-            apt-get install -yq curl python-pip
-            curl -L -o /tmp/docker-$VER.tgz https://get.docker.com/builds/Linux/x86_64/docker-$VER.tgz
+            apt-get install -yq curl python-pip git
+            curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
             tar -xz -C /tmp -f /tmp/docker-$VER.tgz
             mv /tmp/docker/* /usr/bin
       - run:
           name: Install docker-compose
           command: |
             set -x
-            curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+            curl -L "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
             chmod +x /usr/local/bin/docker-compose
       - checkout
       - run:
@@ -32,4 +33,4 @@ jobs:
       - run:
           name: Run integration tests
           working_directory: ~/code/integration-test
-          command: bash run.sh
+          command: ./run.sh
diff --git a/etcd_plugin.py b/etcd_plugin.py
index 0891343..ad85b88 100644
--- a/etcd_plugin.py
+++ b/etcd_plugin.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-import json
 import collections
+
 import collectd
 import requests
 import six
@@ -141,8 +141,8 @@ def read_config(conf):
         elif val.key == 'ssl_ca_certs' and val.values[0]:
             ssl_keys['ssl_ca_certs'] = val.values[0]
         elif val.key == "ssl_cert_validation" and val.values[0]:
-            # Doesn't use str_to_bool because the function defaults to false and
-            # we want to default to true.
+            # Doesn't use str_to_bool because the function defaults to
+            # false and we want to default to true.
             if val.values[0].strip().lower() == 'false':
                 ssl_keys['ssl_cert_validation'] = False
         elif val.key == 'Testing' and str_to_bool(val.values[0]):