diff --git a/org.talend.tos.swtbot.test/src/tosstudio/importexport/ExportJobAsWebserviceInWarFileTest.java b/org.talend.tos.swtbot.test/src/tosstudio/importexport/ExportJobAsWebserviceInWarFileTest.java
index 390b418174..37d3735cfd 100644
--- a/org.talend.tos.swtbot.test/src/tosstudio/importexport/ExportJobAsWebserviceInWarFileTest.java
+++ b/org.talend.tos.swtbot.test/src/tosstudio/importexport/ExportJobAsWebserviceInWarFileTest.java
@@ -15,8 +15,13 @@ package tosstudio.importexport;
 import java.io.IOException;
 import java.net.URISyntaxException;
 
+import junit.framework.Assert;
+
 import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.eclipse.swtbot.swt.finder.waits.Conditions;
 import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -48,11 +53,19 @@ public class ExportJobAsWebserviceInWarFileTest extends TalendSwtBotForTos {
     @Test
     public void exportJob() throws IOException, URISyntaxException {
         jobItem.getItem().contextMenu("Export Job").click();
-        gefBot.shell("Export Job").activate();
+        SWTBotShell shell = gefBot.shell("Export Job").activate();
         gefBot.comboBoxWithLabel("Select the export type").setSelection("Axis WebService (WAR)");
         gefBot.comboBoxWithLabel("To &archive file:").setText(
                 Utilities.getFileFromCurrentPluginSampleFolder("") + FILE_SEPARATOR + "output_job.war");
         gefBot.button("Finish").click();
+        try {
+            gefBot.waitUntil(Conditions.shellCloses(shell), 60000);
+        } catch (TimeoutException e) {
+            gefBot.toolbarButtonWithTooltip("Cancel Operation").click();
+            gefBot.waitUntil(Conditions.widgetIsEnabled(gefBot.button("Cancel")), 60000);
+            gefBot.button("Cancel").click();
+            Assert.fail(e.getMessage());
+        }
 
         gefBot.waitUntil(new DefaultCondition() {
 
diff --git a/org.talend.tos.swtbot.test/src/tosstudio/importexport/ExportJobTest.java b/org.talend.tos.swtbot.test/src/tosstudio/importexport/ExportJobTest.java
index 7b13fee373..cfbb85a9ec 100644
--- a/org.talend.tos.swtbot.test/src/tosstudio/importexport/ExportJobTest.java
+++ b/org.talend.tos.swtbot.test/src/tosstudio/importexport/ExportJobTest.java
@@ -15,8 +15,13 @@ package tosstudio.importexport;
 import java.io.IOException;
 import java.net.URISyntaxException;
 
+import junit.framework.Assert;
+
 import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.eclipse.swtbot.swt.finder.waits.Conditions;
 import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -48,10 +53,18 @@ public class ExportJobTest extends TalendSwtBotForTos {
     @Test
     public void exportJob() throws IOException, URISyntaxException {
         jobItem.getItem().contextMenu("Export Job").click();
-        gefBot.shell("Export Job").activate();
+        SWTBotShell shell = gefBot.shell("Export Job").activate();
         gefBot.comboBoxWithLabel("To &archive file:").setText(
                 Utilities.getFileFromCurrentPluginSampleFolder("") + FILE_SEPARATOR + "output_job.zip");
         gefBot.button("Finish").click();
+        try {
+            gefBot.waitUntil(Conditions.shellCloses(shell), 60000);
+        } catch (TimeoutException e) {
+            gefBot.toolbarButtonWithTooltip("Cancel Operation").click();
+            gefBot.waitUntil(Conditions.widgetIsEnabled(gefBot.button("Cancel")), 60000);
+            gefBot.button("Cancel").click();
+            Assert.fail(e.getMessage());
+        }
 
         gefBot.waitUntil(new DefaultCondition() {