diff --git a/.circleci/config.yml b/.circleci/config.yml
index f4af1c1..a577fff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,37 +1,68 @@
 version: 2.1
 
 executors:
-  go1_11:
+  exec_go_1_11:
     docker:
-    - image: circleci/golang:1.11
-  go1_12:
+      - image: circleci/golang:1.11.13
+  exec_go_1_12:
     docker:
-    - image: circleci/golang:1.12
-  go1_13:
+      - image: circleci/golang:1.12.16
+  exec_go_1_13:
     docker:
-    - image: circleci/golang:1.13
+      - image: circleci/golang:1.13.7
+
+commands:
+  vet:
+    description: "Run go vet"
+    steps:
+      - run: go vet github.com/cucumber/godog
+      - run: go vet github.com/cucumber/godog/gherkin
+      - run: go vet github.com/cucumber/godog/colors
+  fmt:
+    description: "Run go fmt"
+    steps:
+      - run: test -z "$(go fmt ./...)"
+  lint:
+    description: "Run golint"
+    steps:
+      - run: go get -u golang.org/x/lint/golint
+      - run: golint ./godog
+      - run: golint ./cmd/godog/main.go
+  godog:
+    description: "Run godog"
+    steps:
+      - run: GO111MODULE=off go install ./cmd/godog
+      - run: godog -f progress
+  go_test:
+    description: "Run go test"
+    steps:
+      - run: go test -v -race -coverprofile=coverage.txt -covermode=atomic
+  all:
+    description: "Run all commands against godog code"
+    steps:
+      - checkout
+      - vet
+      - fmt
+      - lint
+      - godog
+      - go_test
 
 jobs:
   go1_11:
     working_directory: /go/src/github.com/cucumber/godog
-    executor: go1_11
+    executor: exec_go_1_11
     steps:
-      - checkout
-      - run: make test
-
+      - all
   go1_12:
     working_directory: /go/src/github.com/cucumber/godog
-    executor: go1_12
+    executor: exec_go_1_12
     steps:
-      - checkout
-      - run: make test
-
+      - all
   go1_13:
     working_directory: /go/src/github.com/cucumber/godog
-    executor: go1_13
+    executor: exec_go_1_13
     steps:
-      - checkout
-      - run: make test
+      - all
 
 workflows:
   version: 2
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ef4bdf3..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-language: go
-go:
-  - 1.5.x
-  - 1.6.x
-  - 1.7.x
-  - 1.8.x
-  - 1.9.x
-  - 1.10.x
-  - 1.11.x
-  - 1.12.x
-
-go_import_path: github.com/DATA-DOG/godog
-
-install: go install github.com/DATA-DOG/godog/cmd/godog
-
-script:
-  - go vet github.com/DATA-DOG/godog
-  - go vet github.com/DATA-DOG/godog/gherkin
-  - go vet github.com/DATA-DOG/godog/colors
-  - test -z "$(go fmt ./...)" # fail if not formatted properly
-  - godog -f progress
-  - go test -v -race -coverprofile=coverage.txt -covermode=atomic
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)