diff --git a/README.md b/README.md
index aeea4e1..d8c3ca3 100644
--- a/README.md
+++ b/README.md
@@ -192,8 +192,8 @@ To execute a single test use the `-run` flag.
 go test -run "TestApi_getUser"
 ```
 
-Running tests for all PushBits module is done by the `execute_tests.sh` script provided.
+Running tests for all PushBits module is done like this:
 
 ```bash
-bash execute_tests.sh
+make test
 ```
\ No newline at end of file
diff --git a/execute_tests.sh b/execute_tests.sh
deleted file mode 100644
index 863ee90..0000000
--- a/execute_tests.sh
+++ /dev/null
@@ -1 +0,0 @@
-find . -name '*.go' -printf '%h\n' | sort -u | xargs -n1 -P1 go test -cover
diff --git a/internal/configuration/configuration.go b/internal/configuration/configuration.go
index 3488b99..5da3653 100644
--- a/internal/configuration/configuration.go
+++ b/internal/configuration/configuration.go
@@ -4,6 +4,9 @@ import (
 	"github.com/jinzhu/configor"
 )
 
+// testMode indicates if the package is run in test mode
+var testMode bool
+
 // Argon2Config holds the parameters used for creating hashes with Argon2.
 type Argon2Config struct {
 	Memory      uint32 `default:"131072"`
@@ -55,6 +58,9 @@ type Configuration struct {
 }
 
 func configFiles() []string {
+	if testMode {
+		return []string{"config_unittest.yml"}
+	}
 	return []string{"config.yml"}
 }
 
diff --git a/internal/configuration/configuration_test.go b/internal/configuration/configuration_test.go
index 4aa1e9f..988661a 100644
--- a/internal/configuration/configuration_test.go
+++ b/internal/configuration/configuration_test.go
@@ -18,6 +18,7 @@ type Pair struct {
 }
 
 func TestMain(m *testing.M) {
+	testMode = true
 	m.Run()
 	cleanUp()
 	os.Exit(0)
@@ -145,7 +146,7 @@ func writeMinimalConfig() error {
 		return err
 	}
 
-	return ioutil.WriteFile("config.yml", configString, 0644)
+	return ioutil.WriteFile("config_unittest.yml", configString, 0644)
 }
 
 // Writes a config with default values to config.yml
@@ -159,7 +160,7 @@ func writeValidConfig() error {
 		Environment:          "production",
 		ENVPrefix:            "PUSHBITS",
 		ErrorOnUnmatchedKeys: true,
-	}).Load(config, "config.yml")
+	}).Load(config, "config_unittest.yml")
 	if err != nil {
 		return err
 	}
@@ -173,13 +174,13 @@ func writeValidConfig() error {
 		return err
 	}
 
-	return ioutil.WriteFile("config.yml", configString, 0644)
+	return ioutil.WriteFile("config_unittest.yml", configString, 0644)
 }
 
 // Writes a config that is empty
 func writeEmptyConfig() error {
 	cleanUp()
-	return ioutil.WriteFile("config.yml", []byte(""), 0644)
+	return ioutil.WriteFile("config_unittest.yml", []byte(""), 0644)
 }
 
 // Writes a config with invalid entries
@@ -196,9 +197,9 @@ func writeInvalidConfig() error {
 		return err
 	}
 
-	return ioutil.WriteFile("config.yml", configString, 0644)
+	return ioutil.WriteFile("config_unittest.yml", configString, 0644)
 }
 
 func cleanUp() error {
-	return os.Remove("config.yml")
+	return os.Remove("config_unittest.yml")
 }