diff --git a/Gemfile b/Gemfile
index bb486a20ce42ea170c7ce53627b66f0c25bc9736..310195262ff11883f5845a6e2122e76f283f7f0f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -487,3 +487,5 @@ gem 'liquid', '~> 4.0'
 
 # LRU cache
 gem 'lru_redux'
+
+gem 'erubi', '~> 1.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 58a4f1ad53d9043be0a13d1f01696f36f8f3e21e..53cf1a8d8a5f89579c4a77340851e4ddaf22b140 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1205,6 +1205,7 @@ DEPENDENCIES
   elasticsearch-rails (~> 6.1)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  erubi (~> 1.9.0)
   escape_utils (~> 1.1)
   factory_bot_rails (~> 5.1.0)
   faraday (~> 0.12)
diff --git a/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/advanced_global_advanced_syntax_search_spec.rb b/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/advanced_global_advanced_syntax_search_spec.rb
index 1f755742c766ec41a719781dd5fff827875283d6..03e0cc508b4d39a0e3e694a741fd6adc6b0e4096 100644
--- a/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/advanced_global_advanced_syntax_search_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/advanced_global_advanced_syntax_search_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Elasticsearch advanced global search with advanced syntax', :orchestrated, :elasticsearch, :requires_admin, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/197207' do
+    describe 'Elasticsearch advanced global search with advanced syntax', :orchestrated, :elasticsearch, :requires_admin do
       let(:project_name_suffix) { SecureRandom.hex(8) }
       let(:project_file_name) { 'elasticsearch.rb' }
       let(:project_file_content) { "elasticsearch: #{SecureRandom.hex(8)}" }
diff --git a/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb b/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb
index 93d30a677f77f0e0313b039508d754decfcc9c08..5c003952aa149d387437d1bb2a1634b0ae8574f6 100644
--- a/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Search using Elasticsearch', :orchestrated, :elasticsearch, :requires_admin, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/197207' do
+    describe 'Search using Elasticsearch', :orchestrated, :elasticsearch, :requires_admin do
       include Runtime::Fixtures
 
       before do