diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3f555df5..0aeacfb5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,6 +33,12 @@ jobs:
               sudo apt-get install -y rpm file
               mkdir -p ~/rpmbuild/BUILD ~/rpmbuild/RPMS ~/rpmbuild/SOURCES ~/rpmbuild/SPECS ~/rpmbuild/SRPMS
 
+      - run:
+          name: Run golangci-lint
+          command: |
+              curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0
+              golangci-lint run
+
       - run:
           name: Test debug builds
           command: |
diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 00000000..00934e1d
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,9 @@
+---
+run:
+  issues-exit-code: 0 # TODO: change this to 1 when we want it to fail builds
+  skip-dirs:
+    - contrib/
+    - misc/
+linters:
+  disable:
+    - gocyclo
\ No newline at end of file