diff --git a/Gemfile b/Gemfile
index e761634..5865231 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,16 +24,15 @@ group :development do
   gem "rubocop",        "0.75.1", require: false
   gem "rubocop-rails",  "2.3.2",  require: false
 
-  # automatic test runs
-  gem "guard-rspec",   require: false
-  gem "guard-rubocop", require: false
-
   # debugging
   gem "pry"
   gem "pry-byebug"
 
   # documentation
   gem "yard", require: false
+
+  # rails needs this for development
+  gem "listen"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 3951b1d..03b8571 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,31 +69,13 @@ GEM
     faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    ffi (1.11.1)
-    formatador (0.2.5)
+    ffi (1.15.3)
     fuubar (2.4.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     gitlab (4.17.0)
       httparty (~> 0.18)
       terminal-table (~> 1.5, >= 1.5.1)
-    guard (2.15.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
-      guard (~> 2.0)
-      rubocop (~> 0.20)
     hashdiff (1.0.0)
     httparty (0.18.1)
       mime-types (~> 3.0)
@@ -107,13 +89,12 @@ GEM
     json-schema-rspec (0.0.4)
       json-schema (~> 2.5)
       rspec
-    listen (3.2.0)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.3.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.13)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
     method_source (0.9.2)
@@ -124,12 +105,8 @@ GEM
     minitest (5.12.2)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nenv (0.3.0)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
     nyan-cat-formatter (0.12.0)
       rspec (>= 2.99, >= 2.14.2, < 4)
     octokit (4.21.0)
@@ -172,8 +149,8 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
     rspec (3.9.0)
@@ -217,7 +194,6 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    shellany (0.0.1)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -254,9 +230,8 @@ DEPENDENCIES
   diaspora_federation-rails!
   diaspora_federation-test!
   fuubar (= 2.4.1)
-  guard-rspec
-  guard-rubocop
   json-schema-rspec (= 0.0.4)
+  listen
   nyan-cat-formatter
   pronto (= 0.11.0)
   pronto-rubocop (= 0.11.1)
diff --git a/Guardfile b/Guardfile
deleted file mode 100644
index d0f3e68..0000000
--- a/Guardfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-guard :rspec, cmd: "NO_COVERAGE=true bin/rspec" do
-  require "guard/rspec/dsl"
-  dsl = Guard::RSpec::Dsl.new(self)
-
-  # RSpec files
-  rspec = dsl.rspec
-  watch(rspec.spec_helper) { rspec.spec_dir }
-  watch(rspec.spec_support) { rspec.spec_dir }
-  watch(rspec.spec_files)
-
-  # Ruby files
-  ruby = dsl.ruby
-  dsl.watch_spec_files_for(ruby.lib_files)
-
-  # Rails files
-  rails = dsl.rails
-  dsl.watch_spec_files_for(rails.app_files)
-
-  # Rails config changes
-  rails.app_controller = "app/controllers/diaspora_federation/application_controller.rb"
-  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
-  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
-end
-
-guard :rubocop do
-  watch(/.+\.rb$/)
-  watch(/\.rubocop\.yml$/) {|m| File.dirname(m[0]) }
-end
diff --git a/bin/guard b/bin/guard
deleted file mode 100755
index 3df2151..0000000
--- a/bin/guard
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'guard' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("guard", "guard")