diff --git a/keywords/java/step-library-commons/pom.xml b/keywords/java/step-library-commons/pom.xml
index cd0f0ad..577260e 100644
--- a/keywords/java/step-library-commons/pom.xml
+++ b/keywords/java/step-library-commons/pom.xml
@@ -18,9 +18,22 @@
             <version>${exense-commons.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-            <version>2.0.1</version>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>27.1-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+            <version>2.1.3</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.eclipse.angus/angus-mail -->
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-mail</artifactId>
+            <version>2.0.3</version>
+            <scope>runtime</scope>
         </dependency>
 	</dependencies>
 </project>
diff --git a/keywords/java/step-library-kw-db/src/test/java/ch/exense/step/library/kw/system/DatabaseKeywordsTest.java b/keywords/java/step-library-kw-db/src/test/java/ch/exense/step/library/kw/system/DatabaseKeywordsTest.java
index dcf9534..43da0f4 100644
--- a/keywords/java/step-library-kw-db/src/test/java/ch/exense/step/library/kw/system/DatabaseKeywordsTest.java
+++ b/keywords/java/step-library-kw-db/src/test/java/ch/exense/step/library/kw/system/DatabaseKeywordsTest.java
@@ -13,7 +13,7 @@
 
 public class DatabaseKeywordsTest {
 
-    private ExecutionContext ctx = KeywordRunner.getExecutionContext(Map.of("root_Password","init"),DatabaseKeywords.class);
+    private ExecutionContext ctx = KeywordRunner.getExecutionContext(Map.of("root_Password","xWVK!2Xi23"),DatabaseKeywords.class);
 
     @After
     public void tearDown() {
@@ -22,9 +22,9 @@ public void tearDown() {
 
     @Test
     public void test() throws Exception {
-        Output<JsonObject> output = ctx.run("ExecuteQuery", "{\"ConnectionString\":\"jdbc:mysql://mysql-qa1.exense.ch/TEST\", " +
-                "\"Query\":\"SELECT * from mysqldataset\", " +
+        Output<JsonObject> output = ctx.run("ExecuteQuery", "{\"ConnectionString\":\"jdbc:mysql://34.65.202.8/mysql\", " +
+                "\"Query\":\"SELECT * from user where user like ('root')\", " +
                 "\"Username\":\"root\", \"ResultLimit\":\"1\"}");
-        Assert.assertEquals("{\"ColumnCount\":2,\"ResultAsJson\":\"[{\\\"ID\\\":\\\"1\\\",\\\"VALUE\\\":\\\"value1\\\"}]\"}", output.getPayload().toString());
+        Assert.assertTrue(output.getPayload().toString().contains("root"));
     }
 }