diff --git a/dev_utils/docker-compose.yml b/dev_utils/docker-compose.yml
index f9faf92..31b1a46 100644
--- a/dev_utils/docker-compose.yml
+++ b/dev_utils/docker-compose.yml
@@ -127,7 +127,7 @@ services:
       - "-c"
       - "cd /app; echo 'Running go ${GOLANG_VERSION:-1.18} tests';
          go install 2>/dev/null
-         && go test -tags live -coverprofile=coverage.txt -covermode=atomic"
+         && go test . -v -coverprofile=coverage.txt -covermode=atomic"
     depends_on:
       mq:
         condition: service_healthy
diff --git a/live_test.go b/live_test.go
deleted file mode 100644
index 75777a4..0000000
--- a/live_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// +build live
-// This test assumes that the dev_utils docker-compose services are running
-
-package main
-
-import (
-	"testing"
-
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewAMQPMessenger(t *testing.T) {
-	viper.Reset()
-	viper.Set("server.confFile", "dev_utils/config.yaml")
-
-	config, err := NewConfig()
-	assert.NotNil(t, config)
-	assert.NoError(t, err)
-	tlsConfig, err := TLSConfigBroker(config)
-	assert.NotNil(t, tlsConfig)
-	assert.NoError(t, err)
-
-	assert.NotPanics(t, func() { NewAMQPMessenger(config.Broker, tlsConfig) })
-}
-
-func TestSendMessage(t *testing.T) {
-	viper.Reset()
-	viper.Set("server.confFile", "dev_utils/config.yaml")
-
-	config, err := NewConfig()
-	assert.NotNil(t, config)
-	assert.NoError(t, err)
-	tlsConfig, err := TLSConfigBroker(config)
-	assert.NotNil(t, tlsConfig)
-	assert.NoError(t, err)
-
-	messenger := NewAMQPMessenger(config.Broker, tlsConfig)
-
-	event := Event{}
-	checksum := Checksum{}
-	event.Username = "Dummy"
-	checksum.Type = "md5"
-	checksum.Value = "123456789"
-	event.Checksum = []interface{}{checksum}
-
-	assert.NotPanics(t, func() { messenger.SendMessage(event) })
-
-}
diff --git a/messenger_test.go b/messenger_test.go
index 4980075..ae7ccf9 100644
--- a/messenger_test.go
+++ b/messenger_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"testing"
 
+	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -12,3 +13,49 @@ func TestBuildMqURI(t *testing.T) {
 	amqp := buildMqURI("localhost", "5555", "mquser", "mqpass", "/vhost", false)
 	assert.Equal(t, "amqp://mquser:mqpass@localhost:5555/vhost", amqp)
 }
+
+func TestNewAMQPMessenger(t *testing.T) {
+	viper.Reset()
+	viper.Set("server.confFile", "dev_utils/config.yaml")
+
+	config, err := NewConfig()
+	assert.NoError(t, err)
+	assert.NotNil(t, config)
+	tlsConfig, err := TLSConfigBroker(config)
+	if err != nil {
+		t.Log(err)
+		t.Skip("skip test since certificates are not present")
+	}
+	assert.NotNil(t, tlsConfig)
+	assert.NoError(t, err)
+
+	assert.NotPanics(t, func() { NewAMQPMessenger(config.Broker, tlsConfig) })
+}
+
+func TestSendMessage(t *testing.T) {
+	viper.Reset()
+	viper.Set("server.confFile", "dev_utils/config.yaml")
+
+	config, err := NewConfig()
+	assert.NotNil(t, config)
+	assert.NoError(t, err)
+	tlsConfig, err := TLSConfigBroker(config)
+	if err != nil {
+		t.Log(err)
+		t.Skip("skip test since certificates are not present")
+	}
+	assert.NotNil(t, tlsConfig)
+	assert.NoError(t, err)
+
+	messenger := NewAMQPMessenger(config.Broker, tlsConfig)
+
+	event := Event{}
+	checksum := Checksum{}
+	event.Username = "Dummy"
+	checksum.Type = "md5"
+	checksum.Value = "123456789"
+	event.Checksum = []interface{}{checksum}
+
+	err = messenger.SendMessage(event)
+	assert.NoError(t, err)
+}