diff --git a/debian/tests/spec b/debian/tests/spec
index a5d5e23443..3fa34eab47 100755
--- a/debian/tests/spec
+++ b/debian/tests/spec
@@ -25,16 +25,16 @@ gem 'capybara',            '~> 2.5'
 gem 'poltergeist',         '~> 1.9'
 gem 'capybara-screenshot', '~> 1.0'
 gem 'database_cleaner',   '~> 1.5'
+gem 'shoulda-matchers', '~> 2.8', require: false
 gem 'email_spec', '~> 1.6'
-gem 'ffaker', '~> 2.0'
 gem 'json-schema', '~> 2.6', '>= 2.6.2'
+gem 'webmock', '~> 1.21'
+gem 'ffaker', '~> 2.0'
 EOF
   su gitlab -c "cp ${ADTTMP}/Gemfile ."
 fi
 
 export $(cat /etc/gitlab/gitlab-debian.conf)
 su gitlab -c "bundle install --local"
-su gitlab -c "bundle exec rspec spec/uploaders spec/routing spec/views \
-spec/factories_spec.rb spec/finders"
-
+su gitlab -c "bundle exec rake -f ${AUTOPKGTEST_TMP}/debian/tests/spec.rake
 #config 2/2 failed, controllers many failed
diff --git a/debian/tests/spec.rake b/debian/tests/spec.rake
new file mode 100644
index 0000000000..5b1b9f11ba
--- /dev/null
+++ b/debian/tests/spec.rake
@@ -0,0 +1,5 @@
+require 'gem2deb/rake/spectask'
+
+Gem2Deb::Rake::RSpecTask.new do |spec|
+  spec.pattern = FileList['spec/uploaders/*_spec.rb', 'spec/routing/**/*_spec.rb', 'spec/views/**/*_spec.rb', 'spec/factories_spec.rb', 'spec/finders/**/*_spec.rb'] 
+end
diff --git a/debian/tests/todo/lib/ci b/debian/tests/todo/lib/ci
new file mode 100644
index 0000000000..9eca4baeb0
--- /dev/null
+++ b/debian/tests/todo/lib/ci
@@ -0,0 +1 @@
+spec/lib/banzai/ https://gitlab.com/gitlab-org/gitlab-ce/issues/22289
diff --git a/debian/tests/todo/lib/container_registry b/debian/tests/todo/lib/container_registry
new file mode 100644
index 0000000000..0743030500
--- /dev/null
+++ b/debian/tests/todo/lib/container_registry
@@ -0,0 +1,36 @@
+$ sudo -u gitlab -E -H bundle exec rspec spec/lib/container_registry/
+Error deleting useless .secret file: Permission denied @ unlink_internal - /usr/share/gitlab/.secret
+DEPRECATION WARNING: Sprockets method `register_engine` is deprecated.
+Please register a mime type using `register_mime_type` then
+use `register_compressor` or `register_transformer`.
+https://github.com/rails/sprockets/blob/master/guides/extending_sprockets.md#supporting-all-versions-of-sprockets-in-processors
+ (called from block (2 levels) in <class:Railtie> at /usr/lib/ruby/vendor_ruby/sass/rails/railtie.rb:57)
+DEPRECATION WARNING: Sprockets method `register_engine` is deprecated.
+Please register a mime type using `register_mime_type` then
+use `register_compressor` or `register_transformer`.
+https://github.com/rails/sprockets/blob/master/guides/extending_sprockets.md#supporting-all-versions-of-sprockets-in-processors
+ (called from block (2 levels) in <class:Railtie> at /usr/lib/ruby/vendor_ruby/sass/rails/railtie.rb:58)
+...........F...............................
+
+Failures:
+
+  1) ContainerRegistry::Blob#data when externally stored for invalid file should raise ArgumentError with "invalid address"
+     Failure/Error: it { expect{ subject }.to raise_error(ArgumentError, 'invalid address') }
+
+       expected ArgumentError with "invalid address", got #<NoMethodError: undefined method `request_uri' for #<URI::Generic file:/etc/passwd>> with backtrace:
+         # ./lib/container_registry/client.rb:79:in `redirect_response'
+         # ./lib/container_registry/client.rb:69:in `response_body'
+         # ./lib/container_registry/client.rb:37:in `blob'
+         # ./lib/container_registry/blob.rb:45:in `data'
+         # ./spec/lib/container_registry/blob_spec.rb:66:in `block (3 levels) in <top (required)>'
+         # ./spec/lib/container_registry/blob_spec.rb:107:in `block (6 levels) in <top (required)>'
+         # ./spec/lib/container_registry/blob_spec.rb:107:in `block (5 levels) in <top (required)>'
+     # ./spec/lib/container_registry/blob_spec.rb:107:in `block (5 levels) in <top (required)>'
+
+Finished in 20.94 seconds (files took 8.65 seconds to load)
+43 examples, 1 failure
+
+Failed examples:
+
+rspec ./spec/lib/container_registry/blob_spec.rb:107 # ContainerRegistry::Blob#data when externally stored for invalid file should raise ArgumentError with "invalid address"
+
diff --git a/debian/tests/todo/models b/debian/tests/todo/models
new file mode 100644
index 0000000000..03e0ce1214
--- /dev/null
+++ b/debian/tests/todo/models
@@ -0,0 +1 @@
+https://gitlab.com/gitlab-org/gitlab-ce/issues/22290