diff --git a/Gemfile b/Gemfile
index 4aeb6bd33..f510e7326 100644
--- a/Gemfile
+++ b/Gemfile
@@ -191,6 +191,9 @@ group :development, :test do
   # record and replay TCP/HTTP transactions
   gem 'tcr', git: 'https://github.com/zammad-deps/tcr'
   gem 'vcr'
+
+  # handle deprecations in core and addons
+  gem 'deprecation_toolkit'
 end
 
 # Want to extend Zammad with additional gems?
diff --git a/Gemfile.lock b/Gemfile.lock
index fbfbc5d14..cd6083a51 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -167,6 +167,8 @@ GEM
     delayed_job_active_record (4.1.3)
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
+    deprecation_toolkit (1.4.0)
+      activesupport (>= 4.2)
     diff-lcs (1.3)
     diffy (3.3.0)
     docile (1.3.1)
@@ -575,6 +577,7 @@ DEPENDENCIES
   daemons
   dalli
   delayed_job_active_record
+  deprecation_toolkit
   diffy
   doorkeeper
   eco
@@ -658,4 +661,4 @@ RUBY VERSION
    ruby 2.5.5p157
 
 BUNDLED WITH
-   1.17.3
+   1.7.3
diff --git a/spec/support/deprecation_toolkit.rb b/spec/support/deprecation_toolkit.rb
new file mode 100644
index 000000000..2924df12d
--- /dev/null
+++ b/spec/support/deprecation_toolkit.rb
@@ -0,0 +1,3 @@
+require 'deprecation_toolkit/rspec'
+
+DeprecationToolkit::Configuration.test_runner = :rspec