diff --git a/.cirrus.yml b/.cirrus.yml
index ea88b7b50a48709805ea133abd72031335be74ea..d5498eb5bf414ffca1cc86bdcd15c131dd9796ef 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -67,10 +67,18 @@ test_task:
 
     depends_on:
         - validate
+    gce_instance:
+        matrix:
+            image_name: ${FEDORA_CACHE_IMAGE_NAME}
+            image_name: ${PRIOR_UBUNTU_CACHE_IMAGE_NAME}
 
     env:
         PATH: "$PATH:/var/tmp/go/bin"
 
+    setup_script:
+        - OS_RELEASE_ID="$(source /etc/os-release; echo $ID)"
+        - if [[ "$OS_RELEASE_ID" == "fedora" ]]; then dnf install -y dnsmasq; fi
+
     test_script:
         - make
-        - ./bin/dnsname --help  # STUB!
+        - make test
diff --git a/Makefile b/Makefile
index 7de129670a4656f6ae1d2f4e48eeda11d047ca9b..ed2557ff2fca057de1029c3a221d3c6b3d66af06 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ endef
 
 .install.ginkgo:
 	if [ ! -x "$(GOBIN)/ginkgo" ]; then \
-		$(call go-get,github.com/onsi/ginkgo); \
+		$(call go-get,github.com/onsi/ginkgo/ginkgo); \
 	fi
 
 .install.gitvalidation:
@@ -66,8 +66,12 @@ install:
 clean:
 	rm -fr bin/
 
+test: .install.ginkgo
+	$(GO) test -v ./...
+
 .PHONY: \
 	binaries \
+	test \
 	gofmt \
 	lint \
 	validate