diff --git a/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLScriptTest.java b/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLScriptTest.java
index 419f11cdc55..1d5354302ac 100755
--- a/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLScriptTest.java
+++ b/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLScriptTest.java
@@ -2,19 +2,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.orientechnologies.BaseMemoryDatabase;
+import com.orientechnologies.orient.core.record.impl.ODocument;
+import com.orientechnologies.orient.core.sql.executor.OResult;
+import com.orientechnologies.orient.core.sql.executor.OResultSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.orientechnologies.BaseMemoryDatabase;
-import com.orientechnologies.orient.core.record.impl.ODocument;
-import com.orientechnologies.orient.core.sql.executor.OResult;
-import com.orientechnologies.orient.core.sql.executor.OResultSet;
-
 public class OCommandExecutorSQLScriptTest extends BaseMemoryDatabase {
 
   public void beforeTest() {
diff --git a/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLUpdateTest.java b/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLUpdateTest.java
index 99be4a67bc9..d35e611c077 100755
--- a/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLUpdateTest.java
+++ b/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLUpdateTest.java
@@ -26,7 +26,6 @@
 import static org.junit.Assert.assertTrue;
 
 import com.orientechnologies.BaseMemoryDatabase;
-import com.orientechnologies.orient.core.command.script.OCommandScript;
 import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.record.OElement;
 import com.orientechnologies.orient.core.record.impl.ODocument;
@@ -342,8 +341,8 @@ public void testDottedTargetInScript() throws Exception {
 
     StringBuilder script = new StringBuilder();
     script.append("let $a = select from B;\n");
-    script.append("update $a.a set name = 'baz';\n");
-    db.command(new OCommandScript(script.toString())).execute();
+    script.append("update $a[0].a set name = 'baz';\n");
+    db.execute("sql", script.toString());
 
     try (OResultSet result = db.query("select from A")) {
       assertEquals(result.next().getProperty("name"), "baz");