diff --git a/Makefile b/Makefile
index 5cfa890..4ff4a82 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: check test
+all: check test integration-test
 
 .PHONY: check
 check:
@@ -10,8 +10,11 @@ check:
 
 .PHONY: test
 test:
-	go test -race ./...
-	go test -tags integration ./...
+	go test -cover -race ./...
+
+.PHONY: integration-test
+integration-test:
+	go test -cover -tags integration
 
 .PHONY: get-deps
 get-deps:
diff --git a/mapper_test.go b/mapper_test.go
index edeb54c..4f4dd83 100644
--- a/mapper_test.go
+++ b/mapper_test.go
@@ -1,3 +1,5 @@
+// +build !integration
+
 package gocqlx
 
 import (
diff --git a/queryx_test.go b/queryx_test.go
index 3130219..2c74f85 100644
--- a/queryx_test.go
+++ b/queryx_test.go
@@ -1,3 +1,5 @@
+// +build !integration
+
 package gocqlx
 
 import (