diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d72274a23a84649e474d634dcda6e86a0146cec4..be7150510258059c25fce23eefbf3b8c2cd718cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,8 +15,8 @@ build_test:
     - mkdir -p /go/src/0xacab.org/leap/
     - ln -s "$(pwd)" ${APP_PATH}
     - cd ${APP_PATH}
-    - go get .
-    - go test ./...
+    - make get
+    - make test
     - make build
   tags:
     - linux
diff --git a/Makefile b/Makefile
index 696fcea1228753575fafcf5625de456374b9704a..33a2d6c2fafc7e5b46754bbb8dacba20e6064241 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,15 @@
-.PHONY: all build icon locales generate_locales clean
+.PHONY: all get build icon locales generate_locales clean
 
-all: icon locales build
+all: icon locales get build
+
+get:
+	go get -tags 'gtk_3_18' .
 
 build:
-	go build -ldflags "-X main.version=`git describe --tags`"
+	go build -tags 'gtk_3_18' -ldflags "-X main.version=`git describe --tags`"
+
+test:
+	go test -tags 'gtk_3_18' ./...
 
 clean:
 	make -C icon clean