diff --git a/generators/server/index.js b/generators/server/index.js
index <HASH>..<HASH> 100644
--- a/generators/server/index.js
+++ b/generators/server/index.js
@@ -29,6 +29,7 @@ const statistics = require('../statistics');
 const { getBase64Secret, getRandomHex } = require('../utils');
 const { defaultConfig } = require('../generator-defaults');
 const { GRADLE } = require('../../jdl/jhipster/build-tool-types');
+const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
 
 let useBlueprints;
 
@@ -415,6 +416,9 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
             scriptsStorage.set('docker:db:up', `echo "Docker for db ${databaseType} not configured for application ${this.baseName}"`);
           }
         }
+        if (this.jhipsterConfig.searchEngine === ELASTICSEARCH) {
+          dockerAwaitScripts.push('echo "Waiting for Elasticsearch to start" && wait-on tcp:9200 && echo "Elasticsearch started"');
+        }
 
         const dockerOthersUp = [];
         const dockerOthersDown = [];
Add a wait for Elasticsearch (hoping this is what makes the integration test fail)