diff --git a/plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/CommandDeserializerTest.java b/plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/CommandDeserializerTest.java
index be5766d7766..ed9c6a09e0c 100644
--- a/plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/CommandDeserializerTest.java
+++ b/plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/CommandDeserializerTest.java
@@ -69,8 +69,7 @@ public void composeServiceCommandShouldBeParsedSuccessfully(String command,
         assertEquals(environment.get("MYSQL_PASSWORD"), "password");
         assertTrue(service.getExpose().containsAll(asList("4403", "5502")));
 
-        assertTrue(service.getCommand().containsAll(commandWords));
-        assertEquals(service.getCommand().size(), commandNumberOfWords);
+        assertEquals(service.getCommand(), commandWords);
     }
 
     @DataProvider(name = "validCommand")
@@ -137,7 +136,7 @@ private Object[][] validCommand() {
                 {"\"echo ${PWD}\"", asList("echo", "${PWD}"), 2},
                 {"\"(Test)\"", singletonList("(Test)"), 1},
 
-                {"", singletonList(""), 1},
+                {"", null, 1},
         };
     }
 
diff --git a/plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/EnvironmentDeserializerTest.java b/plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/EnvironmentDeserializerTest.java
index 4820ffffe98..9b7d7e7ba1c 100644
--- a/plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/EnvironmentDeserializerTest.java
+++ b/plugins/plugin-docker/che-plugin-docker-compose/src/test/java/org/eclipse/che/plugin/docker/compose/yaml/EnvironmentDeserializerTest.java
@@ -13,11 +13,9 @@
 import com.google.common.collect.ImmutableMap;
 
 import org.eclipse.che.api.core.ServerException;
-import org.eclipse.che.api.machine.server.util.RecipeDownloader;
 import org.eclipse.che.plugin.docker.compose.ComposeEnvironment;
 import org.eclipse.che.plugin.docker.compose.ComposeServiceImpl;
 import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import org.mockito.testng.MockitoTestNGListener;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Listeners;
@@ -40,9 +38,6 @@
 @Listeners(MockitoTestNGListener.class)
 public class EnvironmentDeserializerTest {
 
-    @Mock
-    private RecipeDownloader recipeDownloader;
-
     @InjectMocks
     private ComposeEnvironmentParser parser;
 
@@ -74,7 +69,7 @@ public Object[][] correctContentTestData() {
                  + "  image: codenvy/ubuntu_jdk8\n"
                  + "  environment:\n"
                  + "   MYSQL_ROOT_PASSWORD: ",
-                 ImmutableMap.of("MYSQL_ROOT_PASSWORD", "")
+                 ImmutableMap.of("MYSQL_ROOT_PASSWORD", null)
                 },
 
                 // dictionary format, value of variable contains colon sign