diff --git a/templates/tools/dockerfile/run_tests_addons.include b/templates/tools/dockerfile/run_tests_addons.include
index 78af3f61362767c386a8a07961248479408a56df..27ac67f5d8feeec3023090c99d06dd7c5870c5a7 100644
--- a/templates/tools/dockerfile/run_tests_addons.include
+++ b/templates/tools/dockerfile/run_tests_addons.include
@@ -5,6 +5,3 @@
 RUN apt-get install -y libzookeeper-mt-dev
 
 RUN mkdir /var/local/jenkins
-
-# Define the default command.
-CMD ["bash"]
diff --git a/templates/tools/dockerfile/test/csharp_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/csharp_jessie_x64/Dockerfile.template
index 66e23505dd6660627af34a16951d8150d1e7ea1b..1c01deac3d4c96cc081427616580b539f6febbb2 100644
--- a/templates/tools/dockerfile/test/csharp_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/csharp_jessie_x64/Dockerfile.template
@@ -34,3 +34,6 @@
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../csharp_deps.include"/>
   <%include file="../../run_tests_addons.include"/>
+  # Define the default command.
+  CMD ["bash"]
+  
diff --git a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
index 913dfaaa6f5d2678c8b567a64fe5d91800fecddd..842c534805059af06a760b130b8fd2c42400e2db 100644
--- a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
@@ -34,3 +34,6 @@
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../cxx_deps.include"/>
   <%include file="../../run_tests_addons.include"/>
+  # Define the default command.
+  CMD ["bash"]
+  
\ No newline at end of file
diff --git a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template
index 576e1aaf405b1de77dde390b6b8364b301d55265..4e95cdd65eaa9de20460d6572272bbec231ce6b1 100644
--- a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template
@@ -34,3 +34,6 @@
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../cxx_deps.include"/>
   <%include file="../../run_tests_addons.include"/>
+  # Define the default command.
+  CMD ["bash"]
+  
\ No newline at end of file
diff --git a/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template
index b5c2ca95d3f7bb8fe205b176f6fb6704e9ce731f..10551a574e38a938e1e3ea0c75a523d87984b41e 100644
--- a/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template
@@ -34,3 +34,6 @@
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../node_deps.include"/>
   <%include file="../../run_tests_addons.include"/>
+  # Define the default command.
+  CMD ["bash"]
+  
\ No newline at end of file
diff --git a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template
index 9e08b37c386accade7ebff204fd158fe8ff32748..d7172398a9ed5750234ebdc1276580a4c4b970e1 100644
--- a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template
@@ -34,3 +34,6 @@
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../php_deps.include"/>
   <%include file="../../run_tests_addons.include"/>
+  # Define the default command.
+  CMD ["bash"]
+  
\ No newline at end of file
diff --git a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template
index a353a19ba964678709d9c065a8ff713d1caa1806..9e68b3ef9174cca980a10bcfea9614e2adafffa9 100644
--- a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template
@@ -34,3 +34,6 @@
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../python_deps.include"/>
   <%include file="../../run_tests_addons.include"/>
+  # Define the default command.
+  CMD ["bash"]
+  
\ No newline at end of file
diff --git a/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template
index 1cc4a1078aa722cc071c49cab5046514df5aa1ac..db777bebb440ef2e1894857383afae2dadc51408 100644
--- a/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template
@@ -34,3 +34,6 @@
   <%include file="../../apt_get_basic.include"/>
   <%include file="../../ruby_deps.include"/>
   <%include file="../../run_tests_addons.include"/>
+  # Define the default command.
+  CMD ["bash"]
+  
\ No newline at end of file
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template
index b9982b0b0f55fa284e8bdd5cc8d30ece6c02e37c..bbdb8485996b3161a1d995af05b70a8777489dfb 100644
--- a/templates/tools/dockerfile/test/sanity/Dockerfile.template
+++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template
@@ -48,3 +48,4 @@
   
   # Define the default command.
   CMD ["bash"]
+  
diff --git a/tools/dockerfile/test/csharp_jessie_x64/Dockerfile b/tools/dockerfile/test/csharp_jessie_x64/Dockerfile
index 84cdc84658c089a4a94086c81c46f5adcfa43f83..0052de6130b7d83543ff8117d31873a318b4c5d1 100644
--- a/tools/dockerfile/test/csharp_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/csharp_jessie_x64/Dockerfile
@@ -97,4 +97,3 @@ RUN mkdir /var/local/jenkins
 
 # Define the default command.
 CMD ["bash"]
-
diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
index 2e2b341c687d14a59e967c708d412ba72e66246d..e3ed39dfe6c09901081d7f1ab345e4e87ca43b37 100644
--- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
@@ -84,4 +84,3 @@ RUN mkdir /var/local/jenkins
 
 # Define the default command.
 CMD ["bash"]
-
diff --git a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile
index 39e125db7a523dc55068fe8602fa40739504168b..9a8f2b1cca385742ab842e6dc679ffeffc6aa5d9 100644
--- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile
+++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile
@@ -84,4 +84,3 @@ RUN mkdir /var/local/jenkins
 
 # Define the default command.
 CMD ["bash"]
-
diff --git a/tools/dockerfile/test/node_jessie_x64/Dockerfile b/tools/dockerfile/test/node_jessie_x64/Dockerfile
index 9e25486f9820f8cb20a22aeb530432e699bd99ce..0655bf7179e8c743d275bf8f7697da2c041dda7a 100644
--- a/tools/dockerfile/test/node_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile
@@ -88,4 +88,3 @@ RUN mkdir /var/local/jenkins
 
 # Define the default command.
 CMD ["bash"]
-
diff --git a/tools/dockerfile/test/php_jessie_x64/Dockerfile b/tools/dockerfile/test/php_jessie_x64/Dockerfile
index f840837ff99c7380ea50113b10bf9e815304691d..43081e7d38ac3fbba4bdec28862d12a52d34e3e6 100644
--- a/tools/dockerfile/test/php_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/php_jessie_x64/Dockerfile
@@ -94,4 +94,3 @@ RUN mkdir /var/local/jenkins
 
 # Define the default command.
 CMD ["bash"]
-
diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile
index 2628d388f8eca6154efa760199b1044c4cd84d7c..7ed8b4c085fbe8880e150828a59bb79652fd3e0b 100644
--- a/tools/dockerfile/test/python_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/python_jessie_x64/Dockerfile
@@ -95,4 +95,3 @@ RUN mkdir /var/local/jenkins
 
 # Define the default command.
 CMD ["bash"]
-
diff --git a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile
index 8cf03f58ce19e0e6bb3912bb238eb631f21dce2e..91af772d72b644f25aee888e66c378242196dbf2 100644
--- a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile
@@ -95,4 +95,3 @@ RUN mkdir /var/local/jenkins
 
 # Define the default command.
 CMD ["bash"]
-