diff --git a/qa/Gemfile b/qa/Gemfile
index 90de65993b7..05b792e7957 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-gem "rspec", "~> 3.1.0"
+gem "rspec", "~> 3.13"
 gem "rake"
 gem "stud"
 gem "pry", :group => :test
diff --git a/qa/docker/spec/spec_helper.rb b/qa/docker/spec/spec_helper.rb
index 52298fcc828..b62d4d1f6e0 100644
--- a/qa/docker/spec/spec_helper.rb
+++ b/qa/docker/spec/spec_helper.rb
@@ -38,7 +38,8 @@ def start_container(image, options = {})
 def wait_for_logstash(container)
   Stud.try(40.times, [NoMethodError, Docker::Error::ConflictError, RSpec::Expectations::ExpectationNotMetError, TypeError]) do
     expect(logstash_available?(container)).to be true
-    expect(get_logstash_status(container)).to eql 'green'
+    # unknown or red status may be also meaningful while testing
+    expect(%w(unknown green yellow red).include?(get_logstash_status(container))).to be true
   end
 end