diff --git a/.github/workflows/test-arangodb.yml b/.github/workflows/test-arangodb.yml
index 8c7d6a1c..374a023c 100644
--- a/.github/workflows/test-arangodb.yml
+++ b/.github/workflows/test-arangodb.yml
@@ -33,6 +33,6 @@ jobs:
       - name: Run Test
         run: cd ./arangodb && go test ./... -v -race
         env:
+          ARANGO_DATABASE: fiber
           ARANGO_USERNAME: username
           ARANGO_PASSWORD: password
-          ARANGO_DATABASE: fiber
diff --git a/arangodb/arangodb.go b/arangodb/arangodb.go
index 945c4eb7..dca88998 100644
--- a/arangodb/arangodb.go
+++ b/arangodb/arangodb.go
@@ -40,7 +40,7 @@ func New(config Config) *Storage {
 
 	// create connection object to arango
 	conn, err := http.NewConnection(http.ConnectionConfig{
-		Endpoints: []string{cfg.hostComposed()},
+		Endpoints: []string{fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)},
 	})
 	if err != nil {
 		panic(err)
diff --git a/arangodb/config.go b/arangodb/config.go
index f1dbe2b7..ad60b83f 100644
--- a/arangodb/config.go
+++ b/arangodb/config.go
@@ -1,7 +1,6 @@
 package arangodb
 
 import (
-	"fmt"
 	"strings"
 	"time"
 )
@@ -20,12 +19,12 @@ type Config struct {
 
 	// Server username
 	//
-	// Mandatory
+	// Optional. Default is ""
 	Username string
 
 	// Server password
 	//
-	// Mandatory
+	// Optional. Default is ""
 	Password string
 
 	// Database name
@@ -58,10 +57,6 @@ var ConfigDefault = Config{
 	GCInterval: 10 * time.Second,
 }
 
-func (c Config) hostComposed() string {
-	return fmt.Sprintf("%s:%d", c.Host, c.Port)
-}
-
 // Helper function to set default values
 func configDefault(cfg Config) Config {
 	// Set default values