diff --git a/test/paper_trail/bang_functions_simple_mode_test.exs b/test/paper_trail/bang_functions_simple_mode_test.exs
index 8680061f..d2344200 100644
--- a/test/paper_trail/bang_functions_simple_mode_test.exs
+++ b/test/paper_trail/bang_functions_simple_mode_test.exs
@@ -8,7 +8,6 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
   alias SimplePerson, as: Person
   alias PaperTrailTest.MultiTenantHelper, as: MultiTenant
 
-  @repo PaperTrail.RepoClient.repo()
   @create_company_params %{name: "Acme LLC", is_active: true, city: "Greenwich"}
   @update_company_params %{
     city: "Hong Kong",
@@ -24,7 +23,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
     Application.put_env(:paper_trail, :originator_type, :integer)
     Code.eval_file("lib/paper_trail.ex")
     Code.eval_file("lib/version.ex")
-    MultiTenant.setup_tenant(@repo)
+    MultiTenant.setup_tenant(repo())
     :ok
   end
 
@@ -71,7 +70,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
              meta: nil
            }
 
-    assert company == first(Company, :id) |> @repo.one
+    assert company == first(Company, :id) |> repo().one
   end
 
   test "PaperTrail.insert!/2 with an error raises Ecto.InvalidChangesetError" do
@@ -126,7 +125,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
              meta: nil
            }
 
-    assert company == first(Company, :id) |> @repo.one |> serialize
+    assert company == first(Company, :id) |> repo().one |> serialize
   end
 
   test "updating a company with originator[user] creates a correct company version" do
@@ -175,7 +174,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
              meta: nil
            }
 
-    assert company == first(Company, :id) |> @repo.one |> serialize
+    assert company == first(Company, :id) |> repo().one |> serialize
   end
 
   test "PaperTrail.update!/2 with an error raises Ecto.InvalidChangesetError" do
@@ -195,7 +194,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
     user = create_user()
     inserted_company = create_company_with_version()
     updated_company = update_company_with_version(inserted_company)
-    company_before_deletion = first(Company, :id) |> @repo.one |> serialize
+    company_before_deletion = first(Company, :id) |> repo().one |> serialize
     deleted_company = PaperTrail.delete!(updated_company, originator: user)
 
     company_count = Company.count()
@@ -310,7 +309,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
              meta: %{"linkname" => "izelnakri"}
            }
 
-    assert person == first(Person, :id) |> @repo.one |> serialize
+    assert person == first(Person, :id) |> repo().one |> serialize
   end
 
   test "updating a person creates a person version with correct attributes" do
@@ -381,7 +380,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
              meta: %{"linkname" => "izelnakri"}
            }
 
-    assert person == first(Person, :id) |> @repo.one |> serialize
+    assert person == first(Person, :id) |> repo().one |> serialize
   end
 
   test "deleting a person creates a person version with correct attributes" do
@@ -412,7 +411,7 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
       })
       |> PaperTrail.update!(origin: "scraper", meta: %{linkname: "izelnakri"})
 
-    person_before_deletion = first(Person, :id) |> @repo.one |> serialize
+    person_before_deletion = first(Person, :id) |> repo().one |> serialize
 
     deleted_person =
       PaperTrail.delete!(
@@ -934,13 +933,13 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
   # Functions
   defp create_user() do
     User.changeset(%User{}, %{token: "fake-token", username: "izelnakri"})
-    |> @repo.insert!
+    |> repo().insert!
   end
 
   defp create_user(:multitenant) do
     User.changeset(%User{}, %{token: "fake-token", username: "izelnakri"})
     |> MultiTenant.add_prefix_to_changeset()
-    |> @repo.insert!
+    |> repo().insert!
   end
 
   defp create_company_with_version(params \\ @create_company_params, options \\ nil) do
@@ -972,11 +971,11 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
   end
 
   defp first_company(:multitenant) do
-    first(Company, :id) |> MultiTenant.add_prefix_to_query() |> @repo.one()
+    first(Company, :id) |> MultiTenant.add_prefix_to_query() |> repo().one()
   end
 
   defp first_person(:multitenant) do
-    first(Person, :id) |> MultiTenant.add_prefix_to_query() |> @repo.one()
+    first(Person, :id) |> MultiTenant.add_prefix_to_query() |> repo().one()
   end
 
   defp serialize(model) do
@@ -985,24 +984,28 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
   end
 
   defp reset_all_data() do
-    @repo.delete_all(Person)
-    @repo.delete_all(Company)
-    @repo.delete_all(Version)
+    repo().delete_all(Person)
+    repo().delete_all(Company)
+    repo().delete_all(Version)
 
     Person
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
 
     Company
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
 
     Version
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
   end
 
   defp convert_to_string_map(map) do
     map |> Jason.encode!() |> Jason.decode!()
   end
+
+  defp repo() do
+    PaperTrail.RepoClient.repo()
+  end
 end
diff --git a/test/paper_trail/bang_functions_strict_mode_test.exs b/test/paper_trail/bang_functions_strict_mode_test.exs
index f0103a16..4db650fd 100644
--- a/test/paper_trail/bang_functions_strict_mode_test.exs
+++ b/test/paper_trail/bang_functions_strict_mode_test.exs
@@ -8,7 +8,6 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
   alias StrictPerson, as: Person
   alias PaperTrailTest.MultiTenantHelper, as: MultiTenant
 
-  @repo PaperTrail.RepoClient.repo()
   @create_company_params %{name: "Acme LLC", is_active: true, city: "Greenwich"}
   @update_company_params %{
     city: "Hong Kong",
@@ -24,7 +23,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
     Application.put_env(:paper_trail, :originator_type, :integer)
     Code.eval_file("lib/paper_trail.ex")
     Code.eval_file("lib/version.ex")
-    MultiTenant.setup_tenant(@repo)
+    MultiTenant.setup_tenant(repo())
     :ok
   end
 
@@ -74,7 +73,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
              meta: nil
            }
 
-    assert company == first(Company, :id) |> @repo.one |> serialize
+    assert company == first(Company, :id) |> repo().one |> serialize
   end
 
   test "creating a company without changeset creates a company version with correct attributes" do
@@ -168,7 +167,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
              meta: nil
            }
 
-    assert company == first(Company, :id) |> @repo.one |> serialize
+    assert company == first(Company, :id) |> repo().one |> serialize
   end
 
   test "PaperTrail.update!/2 with an error raises Ecto.InvalidChangesetError" do
@@ -190,7 +189,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
     inserted_company_version = PaperTrail.get_version(inserted_company)
     updated_company = update_company_with_version(inserted_company)
     updated_company_version = PaperTrail.get_version(updated_company)
-    company_before_deletion = first(Company, :id) |> @repo.one |> serialize
+    company_before_deletion = first(Company, :id) |> repo().one |> serialize
     deleted_company = PaperTrail.delete!(updated_company, user: user)
 
     company_count = Company.count()
@@ -308,7 +307,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
              meta: %{"linkname" => "izelnakri"}
            }
 
-    assert person == first(Person, :id) |> @repo.one |> serialize
+    assert person == first(Person, :id) |> repo().one |> serialize
   end
 
   test "updating a person creates a person version with correct attributes" do
@@ -385,7 +384,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
              meta: %{"linkname" => "izelnakri"}
            }
 
-    assert person == first(Person, :id) |> @repo.one |> serialize
+    assert person == first(Person, :id) |> repo().one |> serialize
   end
 
   test "deleting a person creates a person version with correct attributes" do
@@ -418,7 +417,7 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
       |> PaperTrail.update!(origin: "scraper", meta: %{linkname: "izelnakri"})
 
     updated_person_version = PaperTrail.get_version(updated_person) |> serialize
-    person_before_deletion = first(Person, :id) |> @repo.one
+    person_before_deletion = first(Person, :id) |> repo().one
 
     deleted_person =
       PaperTrail.delete!(
@@ -961,13 +960,13 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
   # Functions
   defp create_user() do
     User.changeset(%User{}, %{token: "fake-token", username: "izelnakri"})
-    |> @repo.insert!
+    |> repo().insert!
   end
 
   defp create_user(:multitenant) do
     User.changeset(%User{}, %{token: "fake-token", username: "izelnakri"})
     |> MultiTenant.add_prefix_to_changeset()
-    |> @repo.insert!
+    |> repo().insert!
   end
 
   defp create_company_with_version(params \\ @create_company_params, options \\ nil) do
@@ -999,11 +998,11 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
   end
 
   defp first_company(:multitenant) do
-    first(Company, :id) |> MultiTenant.add_prefix_to_query() |> @repo.one()
+    first(Company, :id) |> MultiTenant.add_prefix_to_query() |> repo().one()
   end
 
   defp first_person(:multitenant) do
-    first(Person, :id) |> MultiTenant.add_prefix_to_query() |> @repo.one()
+    first(Person, :id) |> MultiTenant.add_prefix_to_query() |> repo().one()
   end
 
   defp serialize(model) do
@@ -1012,24 +1011,28 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
   end
 
   defp reset_all_data() do
-    @repo.delete_all(Person)
-    @repo.delete_all(Company)
-    @repo.delete_all(Version)
+    repo().delete_all(Person)
+    repo().delete_all(Company)
+    repo().delete_all(Version)
 
     Person
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
 
     Company
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
 
     Version
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
   end
 
   defp convert_to_string_map(map) do
     map |> Jason.encode!() |> Jason.decode!()
   end
+
+  defp repo() do
+    PaperTrail.RepoClient.repo()
+  end
 end
diff --git a/test/paper_trail/paper_trail_version_test.exs b/test/paper_trail/paper_trail_version_test.exs
index 3ca99963..591feaaf 100644
--- a/test/paper_trail/paper_trail_version_test.exs
+++ b/test/paper_trail/paper_trail_version_test.exs
@@ -14,31 +14,29 @@ defmodule PaperTrailTest.Version do
   }
   @invalid_attrs %{}
 
-  @repo PaperTrail.RepoClient.repo()
-
   setup_all do
     Application.put_env(:paper_trail, :strict_mode, false)
     Application.put_env(:paper_trail, :repo, PaperTrail.Repo)
     Application.put_env(:paper_trail, :originator_type, :integer)
     Code.eval_file("lib/paper_trail.ex")
     Code.eval_file("lib/version.ex")
-    MultiTenant.setup_tenant(@repo)
+    MultiTenant.setup_tenant(repo())
     :ok
   end
 
   setup do
-    @repo.delete_all(Version)
+    repo().delete_all(Version)
 
     Version
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
 
     on_exit(fn ->
-      @repo.delete_all(Version)
+      repo().delete_all(Version)
 
       Version
       |> MultiTenant.add_prefix_to_query()
-      |> @repo.delete_all()
+      |> repo().delete_all()
     end)
 
     :ok
@@ -142,7 +140,7 @@ defmodule PaperTrailTest.Version do
   end
 
   def add_three_versions(prefix \\ nil) do
-    @repo.insert_all(
+    repo().insert_all(
       Version,
       [
         @valid_attrs,
@@ -175,4 +173,8 @@ defmodule PaperTrailTest.Version do
     relationships = resource.__struct__.__schema__(:associations)
     Map.drop(resource, [:__meta__, :__struct__] ++ relationships)
   end
+
+  defp repo() do
+    PaperTrail.RepoClient.repo()
+  end
 end
diff --git a/test/paper_trail/version_queries_test.exs b/test/paper_trail/version_queries_test.exs
index 5a7d4d02..72db9dfa 100644
--- a/test/paper_trail/version_queries_test.exs
+++ b/test/paper_trail/version_queries_test.exs
@@ -8,13 +8,11 @@ defmodule PaperTrailTest.VersionQueries do
 
   import Ecto.Query
 
-  @repo PaperTrail.RepoClient.repo()
-
   setup_all do
     Application.put_env(:paper_trail, :repo, PaperTrail.Repo)
     Application.put_env(:paper_trail, :originator_type, :integer)
     Code.eval_file("lib/version.ex")
-    MultiTenant.setup_tenant(@repo)
+    MultiTenant.setup_tenant(repo())
     reset_all_data()
 
     Company.changeset(%Company{}, %{
@@ -24,7 +22,7 @@ defmodule PaperTrailTest.VersionQueries do
     })
     |> PaperTrail.insert()
 
-    old_company = first(Company, :id) |> @repo.one
+    old_company = first(Company, :id) |> repo().one
 
     Company.changeset(old_company, %{
       city: "Hong Kong",
@@ -33,7 +31,7 @@ defmodule PaperTrailTest.VersionQueries do
     })
     |> PaperTrail.update()
 
-    first(Company, :id) |> @repo.one |> PaperTrail.delete()
+    first(Company, :id) |> repo().one |> PaperTrail.delete()
 
     Company.changeset(%Company{}, %{
       name: "Acme LLC",
@@ -48,7 +46,7 @@ defmodule PaperTrailTest.VersionQueries do
     })
     |> PaperTrail.insert()
 
-    company = first(Company, :id) |> @repo.one
+    company = first(Company, :id) |> repo().one
 
     # add link name later on
     Person.changeset(%Person{}, %{
@@ -60,7 +58,7 @@ defmodule PaperTrailTest.VersionQueries do
     |> PaperTrail.insert(set_by: "admin")
 
     another_company =
-      @repo.one(
+      repo().one(
         from(
           c in Company,
           where: c.name == "Another Company Corp.",
@@ -68,7 +66,7 @@ defmodule PaperTrailTest.VersionQueries do
         )
       )
 
-    Person.changeset(first(Person, :id) |> @repo.one, %{
+    Person.changeset(first(Person, :id) |> repo().one, %{
       first_name: "Isaac",
       visit_count: 10,
       birthdate: ~D[1992-04-01],
@@ -88,7 +86,7 @@ defmodule PaperTrailTest.VersionQueries do
     company_multi =
       first(Company, :id)
       |> MultiTenant.add_prefix_to_query()
-      |> @repo.one
+      |> repo().one
 
     Person.changeset(%Person{}, %{
       first_name: "Izel",
@@ -104,18 +102,18 @@ defmodule PaperTrailTest.VersionQueries do
 
   test "get_version gives us the right version" do
     tenant = MultiTenant.tenant()
-    last_person = last(Person, :id) |> @repo.one
-    target_version = last(Version, :id) |> @repo.one
+    last_person = last(Person, :id) |> repo().one
+    target_version = last(Version, :id) |> repo().one
 
     last_person_multi =
       last(Person, :id)
       |> MultiTenant.add_prefix_to_query()
-      |> @repo.one
+      |> repo().one
 
     target_version_multi =
       last(Version, :id)
       |> MultiTenant.add_prefix_to_query()
-      |> @repo.one
+      |> repo().one
 
     assert PaperTrail.get_version(last_person) == target_version
     assert PaperTrail.get_version(Person, last_person.id) == target_version
@@ -129,10 +127,10 @@ defmodule PaperTrailTest.VersionQueries do
 
   test "get_versions gives us the right versions" do
     tenant = MultiTenant.tenant()
-    last_person = last(Person, :id) |> @repo.one
+    last_person = last(Person, :id) |> repo().one
 
     target_versions =
-      @repo.all(
+      repo().all(
         from(
           version in Version,
           where: version.item_type == "SimplePerson" and version.item_id == ^last_person.id
@@ -142,7 +140,7 @@ defmodule PaperTrailTest.VersionQueries do
     last_person_multi =
       last(Person, :id)
       |> MultiTenant.add_prefix_to_query()
-      |> @repo.one
+      |> repo().one
 
     target_versions_multi =
       from(
@@ -150,7 +148,7 @@ defmodule PaperTrailTest.VersionQueries do
         where: version.item_type == "SimplePerson" and version.item_id == ^last_person_multi.id
       )
       |> MultiTenant.add_prefix_to_query()
-      |> @repo.all
+      |> repo().all
 
     assert PaperTrail.get_versions(last_person) == target_versions
     assert PaperTrail.get_versions(Person, last_person.id) == target_versions
@@ -163,13 +161,13 @@ defmodule PaperTrailTest.VersionQueries do
   end
 
   test "get_current_model/1 gives us the current record of a version" do
-    person = first(Person, :id) |> @repo.one
+    person = first(Person, :id) |> repo().one
 
     first_version =
       Version
       |> where([v], v.item_type == "SimplePerson" and v.item_id == ^person.id)
       |> first
-      |> @repo.one
+      |> repo().one
 
     assert PaperTrail.get_current_model(first_version) == person
   end
@@ -178,20 +176,24 @@ defmodule PaperTrailTest.VersionQueries do
 
   # Functions
   defp reset_all_data() do
-    @repo.delete_all(Person)
-    @repo.delete_all(Company)
-    @repo.delete_all(Version)
+    repo().delete_all(Person)
+    repo().delete_all(Company)
+    repo().delete_all(Version)
 
     Person
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
 
     Company
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
 
     Version
     |> MultiTenant.add_prefix_to_query()
-    |> @repo.delete_all()
+    |> repo().delete_all()
+  end
+
+  defp repo() do
+    PaperTrail.RepoClient.repo()
   end
 end