diff --git a/test/shared/support/docker_container.rb b/test/shared/support/docker_container.rb
index 08e889a6d3..228cb4c49c 100644
--- a/test/shared/support/docker_container.rb
+++ b/test/shared/support/docker_container.rb
@@ -40,12 +40,14 @@ def find_container
         containers = Docker::Container.all(:all => true)
         containers.each do |container|
           if @command == nil
-            if container.info['Image'] == @image
+            if container.info['Image'] == @image || container.info['Image'].split(':').first == @image
               return container
             end
           else
-            if container.info['Command'] == @command && container.info['Image'] == @image
-              return container
+            if container.info['Command'] == @command 
+              if container.info['Image'] == @image || container.info['Image'].split(':').first == @image
+                return container
+              end
             end
           end
         end