diff --git a/src/jobs/models/jobManager.js b/src/jobs/models/jobManager.js
index 023de0224..b257f9644 100644
--- a/src/jobs/models/jobManager.js
+++ b/src/jobs/models/jobManager.js
@@ -73,12 +73,9 @@ module.exports.createJob = async (job) => {
         }
         logger.info(`Job ${jobId} deployed successfully`);
         const jobResponse = createResponse(jobId, job, report);
-        const streamingResource = {
-            job_id: jobResponse.id,
-            job_type: jobResponse.type,
-            ...jobResponse
-        };
-        streamingManager.produce({}, STREAMING_EVENT_TYPES.JOB_CREATED, streamingResource);
+        if (job.run_immediately) {
+            produceJobToStreamingPlatform(jobResponse);
+        }
 
         return jobResponse;
     } catch (error) {
@@ -289,12 +286,7 @@ function addCron(job, cronExpression, configData) {
         }
         const report = await runJob(job, configData);
         const jobResponse = createResponse(job.id, job, report);
-        const streamingResource = {
-            job_id: jobResponse.id,
-            job_type: jobResponse.type,
-            ...jobResponse
-        };
-        streamingManager.produce({}, STREAMING_EVENT_TYPES.JOB_CREATED, streamingResource);
+        produceJobToStreamingPlatform(jobResponse);
     }, function () {
         logger.info(`Job: ${job.id} completed.`);
     }, true);
@@ -378,3 +370,12 @@ async function runJob(job, configData) {
     }
     return report;
 }
+
+function produceJobToStreamingPlatform(jobResponse) {
+    const streamingResource = {
+        job_id: jobResponse.id,
+        job_type: jobResponse.type,
+        ...jobResponse
+    };
+    streamingManager.produce({}, STREAMING_EVENT_TYPES.JOB_CREATED, streamingResource);
+}
\ No newline at end of file
diff --git a/tests/integration-tests-with-streaming/run.sh b/tests/integration-tests-with-streaming/run.sh
index c15581aeb..168660727 100755
--- a/tests/integration-tests-with-streaming/run.sh
+++ b/tests/integration-tests-with-streaming/run.sh
@@ -16,4 +16,4 @@ echo Running integration tests with "$DATABASE_TYPE" db and "$JOB_PLATFORM" inte
 source $CURR_DIR/tests/configurations/"$DATABASE_TYPE"Configuration.sh
 source $CURR_DIR/tests/configurations/"$JOB_PLATFORM"Configuration.sh
 source $CURR_DIR/tests/configurations/"$STREAMING_PLATFORM"Configuration.sh
-node_modules/.bin/_mocha $CURR_DIR/tests/integration-tests-with-streaming --recursive --timeout=30000 --retries=2 --exit
+node_modules/.bin/_mocha $CURR_DIR/tests/integration-tests-with-streaming --recursive --timeout=40000 --retries=2 --exit
diff --git a/tests/integration-tests/run.sh b/tests/integration-tests/run.sh
index 821f26a5f..4363e4a2f 100755
--- a/tests/integration-tests/run.sh
+++ b/tests/integration-tests/run.sh
@@ -16,4 +16,4 @@ fi
 echo Running integration tests with "$DATABASE_TYPE" db and "$JOB_PLATFORM" integration
 source $CURR_DIR/tests/configurations/"$DATABASE_TYPE"Configuration.sh
 source $CURR_DIR/tests/configurations/"$JOB_PLATFORM"Configuration.sh
-node_modules/.bin/_mocha $CURR_DIR/tests/integration-tests --recursive --timeout=30000 --retries=2 --exit
+node_modules/.bin/_mocha $CURR_DIR/tests/integration-tests --recursive --timeout=40000 --retries=2 --exit