diff --git a/Makefile b/Makefile
index 2d389e51f9..25e5b641a8 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ ifeq ($(BUILD_ENTERPRISE_READY),true)
 
 	@if [ $(shell docker ps -a --no-trunc --quiet --filter name=^/mattermost-elasticsearch$$ | wc -l) -eq 0 ]; then \
 		echo starting mattermost-elasticsearch; \
-		docker run --name mattermost-elasticsearch -p 9200:9200 -e "http.host=0.0.0.0" -e "transport.host=127.0.0.1" -e "ES_JAVA_OPTS=-Xms250m -Xmx250m" -d mattermost/mattermost-elasticsearch-docker:6.5.1 > /dev/null; \
+		docker run --name mattermost-elasticsearch -p 9200:9200 -e "http.host=0.0.0.0" -e "transport.host=127.0.0.1" -e "ES_JAVA_OPTS=-Xms512m -Xmx512m" -d mattermost/mattermost-elasticsearch-docker:6.5.1 > /dev/null; \
 	elif [ $(shell docker ps --no-trunc --quiet --filter name=^/mattermost-elasticsearch$$ | wc -l) -eq 0 ]; then \
 		echo restarting mattermost-elasticsearch; \
 		docker start mattermost-elasticsearch> /dev/null; \
diff --git a/api4/apitestlib.go b/api4/apitestlib.go
index 5cbe9399a1..06745e92dd 100644
--- a/api4/apitestlib.go
+++ b/api4/apitestlib.go
@@ -88,6 +88,10 @@ func setupTestHelper(enterprise bool, updateConfig func(*model.Config)) *TestHel
 		*cfg.TeamSettings.MaxUsersPerTeam = 50
 		*cfg.RateLimitSettings.Enable = false
 		*cfg.EmailSettings.SendEmailNotifications = true
+
+		// Disable sniffing, otherwise elastic client fails to connect to docker node
+		// More details: https://github.com/olivere/elastic/wiki/Sniffing
+		*cfg.ElasticsearchSettings.Sniff = false
 	})
 	prevListenAddress := *th.App.Config().ServiceSettings.ListenAddress
 	th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" })
diff --git a/build/docker-compose.yml b/build/docker-compose.yml
index 788f42b8a4..00b076a7d4 100644
--- a/build/docker-compose.yml
+++ b/build/docker-compose.yml
@@ -58,7 +58,7 @@ services:
     environment:
       http.host: "0.0.0.0"
       transport.host: "127.0.0.1"
-      ES_JAVA_OPTS: "-Xms250m -Xmx250m"
+      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
   redis:
     image: redis
     networks: