diff --git a/store/elasticsearch/init_test.go b/store/elasticsearch/init_test.go
index cd8dbdcd..326a6faf 100644
--- a/store/elasticsearch/init_test.go
+++ b/store/elasticsearch/init_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"os"
 	"testing"
 
@@ -20,8 +21,13 @@ func TestMain(m *testing.M) {
 	// an elasticsearch server. That means you can't run unit tests
 	// standlone :/
 	esTestServer = testutil.NewElasticsearchTestServer()
-	defer esTestServer.Close()
-	os.Exit(m.Run())
+	exitCode := m.Run()
+
+	if err := esTestServer.Close(); err != nil {
+		fmt.Println("Error closing elasticsearch test server:", err)
+		return
+	}
+	os.Exit(exitCode)
 }
 
 // name this somethings that's more generic
diff --git a/store/elasticsearch/testutil/elastic_search.go b/store/elasticsearch/testutil/elastic_search.go
index d47df3d8..cd3f6e54 100644
--- a/store/elasticsearch/testutil/elastic_search.go
+++ b/store/elasticsearch/testutil/elastic_search.go
@@ -14,8 +14,7 @@ import (
 
 var (
 	elasticSearchCmdLine = []string{
-		"docker", "run", "-d", "-P", "-e", "discovery.type=single-node",
-		"elasticsearch:7.6.1",
+		"docker", "run", "-d", "-P", "--rm", "-e", "discovery.type=single-node", "elasticsearch:7.6.1",
 	}
 	// "9200/tcp" refers to the default container port where elasticsearch server runs
 	esHostQuery = `{{index .NetworkSettings.Ports "9200/tcp" 0 "HostIp"}}:{{index .NetworkSettings.Ports "9200/tcp" 0 "HostPort"}}`