diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e66f95d..9dd2e78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,20 @@
+image: golang:latest
+
 stages:
-  - test
+  - validate
+
+fmt:
+  stage: validate
+  script:
+    - gofmt -l -s -e .
+    - exit $(gofmt -l -s -e . | wc -l)
+
+vet:
+  stage: validate
+  script:
+    - go vet -composites=false ./...
 
 test:
-  image: golang:latest
-  stage: test
+  stage: validate
   script:
-    - go test -v ./...
+    - go test -race -v ./...
diff --git a/README.md b/README.md
index f925e7b..c50390d 100644
--- a/README.md
+++ b/README.md
@@ -14,4 +14,4 @@ Documentation is available via [godoc](https://godoc.org):
 
 ## Support
 
-Please share issues/suggestions [here](https:/gitlab.com/tslocum/joker-cribbage/issues).
+Please share issues and suggestions [here](https:/gitlab.com/tslocum/joker-cribbage/issues).