diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..7462e30
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,3 @@
+--format Fuubar
+--color
+--require spec_helper
\ No newline at end of file
diff --git a/bin/rspec b/bin/rspec
new file mode 100755
index 0000000..0c86b5c
--- /dev/null
+++ b/bin/rspec
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' 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('rspec-core', 'rspec')
diff --git a/lib/diaspora_federation/engine.rb b/lib/diaspora_federation/engine.rb
index 6c5a42c..db6a12c 100644
--- a/lib/diaspora_federation/engine.rb
+++ b/lib/diaspora_federation/engine.rb
@@ -1,5 +1,9 @@
 module DiasporaFederation
   class Engine < ::Rails::Engine
     isolate_namespace DiasporaFederation
+
+    config.generators do |g|
+      g.test_framework :rspec
+    end
   end
 end
diff --git a/spec/dummy_spec.rb b/spec/dummy_spec.rb
new file mode 100644
index 0000000..3bca5dd
--- /dev/null
+++ b/spec/dummy_spec.rb
@@ -0,0 +1,6 @@
+describe "Dummy" do
+  # dummy test
+  it "should be true" do
+    expect(true).to be_truthy
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 0000000..3cb65f8
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,46 @@
+ENV["RAILS_ENV"] ||= "test"
+require File.join(File.dirname(__FILE__), "..", "test", "dummy", "config", "environment")
+
+require "rspec/rails"
+
+RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
+
+  config.expect_with :rspec do |expect_config|
+    expect_config.syntax = :expect
+  end
+
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+end
diff --git a/test/diaspora_federation_test.rb b/test/diaspora_federation_test.rb
deleted file mode 100644
index f624d47..0000000
--- a/test/diaspora_federation_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class DiasporaFederationTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, DiasporaFederation
-  end
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
deleted file mode 100644
index 3496ab0..0000000
--- a/test/test_helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require "rails/test_help"
-
-# Filter out Minitest backtrace while allowing backtrace from other libraries
-# to be shown.
-Minitest.backtrace_filter = Minitest::BacktraceFilter.new
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f }