2 files changed, 5 insertions, 3 deletions
diff --git a/lib/tasks/gitlab/artifacts/migrate.rake b/lib/tasks/gitlab/artifacts/migrate.rake
index 084e7c78906..47b356aa6e6 100644
--- a/lib/tasks/gitlab/artifacts/migrate.rake
+++ b/lib/tasks/gitlab/artifacts/migrate.rake
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'logger'
-require 'resolv-replace'
-
 desc 'GitLab | Artifacts | Migrate files for artifacts to comply with new storage format'
 namespace :gitlab do
+  require 'logger'
+  require 'resolv-replace'
+
   namespace :artifacts do
     task migrate: :environment do
       logger = Logger.new($stdout)
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 51e361de73c..c4dc7b938cc 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -462,6 +462,8 @@ namespace :gitlab do
             .each { |c| classes[c.table_name] << c.name if classes.has_key?(c.table_name) }
 
           sources.each do |source_name|
+            next if source_name.start_with?('_test_') # Ignore test tables
+
             database = model_class.connection_db_config.name
             file = dictionary_file_path(source_name, views, database)
             key_name = "#{data_source_type(source_name, views)}_name"