diff --git a/.travis.yml b/.travis.yml
index 200eaeb..1b8bcdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: go
 go:
-- 1.7
-- 1.8
-- 1.9
+- 1.13
+- 1.12
+- 1.11
 os:
 - linux
 install:
diff --git a/Makefile b/Makefile
index a8a1b0b..c1eb9f5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ TOOLS := $(shell ls ./cmd)
 all:
 	make $(TOOLS)
 
-
 $(TOOLS):
 	make -C ./cmd/$@
 
@@ -53,4 +52,3 @@ godep-restore-%:
 get-build-deps:
 	@echo "+ Downloading build dependencies"
 	@go get github.com/tools/godep
-	@go get github.com/golang/lint/golint
diff --git a/cmd/smtp-checker/apps/wordpress/smtp-wordpress_test.go b/cmd/smtp-checker/apps/wordpress/smtp-wordpress_test.go
index a587249..6b5028d 100644
--- a/cmd/smtp-checker/apps/wordpress/smtp-wordpress_test.go
+++ b/cmd/smtp-checker/apps/wordpress/smtp-wordpress_test.go
@@ -48,7 +48,7 @@ func TestParseWPDatabaseConfig(t *testing.T) {
 			t.Errorf("Incorrect database host detected, expected: localhost, got: %s", database.Host)
 		}
 		if database.Port != 3306 {
-			t.Errorf("Incorrect database port detected, expected: 3306, got: %s", database.Port)
+			t.Errorf("Incorrect database port detected, expected: 3306, got: %d", database.Port)
 		}
 		if database.Name != "bitnami_wordpress" {
 			t.Errorf("Incorrect database name detected, expected: bitnami_wordpress, got: %s", database.Name)
@@ -87,7 +87,7 @@ func TestObtainSMTP(t *testing.T) {
 			t.Errorf("Incorrect SMTP host detected, expected: smtp.gmail.com, got: %s", smtp.Host)
 		}
 		if smtp.Port != 587 {
-			t.Errorf("Incorrect SMTP port detected, expected: 587, got: %s", smtp.Port)
+			t.Errorf("Incorrect SMTP port detected, expected: 587, got: %d", smtp.Port)
 		}
 		if smtp.Pass != "XXXXXXXX" {
 			t.Errorf("Incorrect SMTP password detected, expected: XXXXXXXX, got: %s", smtp.Pass)
diff --git a/cmd/smtp-checker/smtpchecks_test.go b/cmd/smtp-checker/smtpchecks_test.go
index 39c389d..afa0501 100644
--- a/cmd/smtp-checker/smtpchecks_test.go
+++ b/cmd/smtp-checker/smtpchecks_test.go
@@ -7,15 +7,6 @@ import (
 	"testing"
 )
 
-func TestRunConnectivityChecks(t *testing.T) {
-	t.Run("Check connectivity with SMTP server", func(t *testing.T) {
-		err := RunConnectivityChecks("smtp.gmail.com", 25)
-		if err != nil {
-			t.Errorf("error connecting to smtp server: %v", err)
-		}
-	})
-}
-
 func TestRunTLSConnectivityChecks(t *testing.T) {
 	t.Run("Check connectivity with SMTP server via TLS", func(t *testing.T) {
 		err := RunTLSConnectivityChecks("smtp.gmail.com", 465)