diff --git a/configurations/git/default.nix b/configurations/git/default.nix
index b8213b27..53102091 100644
--- a/configurations/git/default.nix
+++ b/configurations/git/default.nix
@@ -26,7 +26,7 @@
         ".envrc"
         "shell.nix"
         # Ruby dependencies in source tree
-        "/vendor/rubygems"
+        "/vendor/bundle"
         "**/*.patch"
       ];
       userEmail = config.custom.git.email;
diff --git a/shells/accentor-api.nix b/shells/accentor-api.nix
index a758f68a..a56b3165 100644
--- a/shells/accentor-api.nix
+++ b/shells/accentor-api.nix
@@ -25,7 +25,7 @@ pkgs.mkShell {
   ];
   shellHook = ''
     export DATABASE_URL="postgres://postgres:accentor@127.0.0.1:5432/accentor"
-    export GEM_HOME="$PWD/vendor/rubygems/$(ruby -e 'puts RUBY_VERSION')"
+    export GEM_HOME="$PWD/vendor/bundle/$(ruby -e 'puts RUBY_VERSION')"
     export PATH="$GEM_HOME/bin:$PATH"
   '';
 }
diff --git a/shells/dodona.nix b/shells/dodona.nix
index afabd989..f7562372 100644
--- a/shells/dodona.nix
+++ b/shells/dodona.nix
@@ -26,8 +26,9 @@ pkgs.mkShell {
     )
   ];
   shellHook = ''
+    export TEST_DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona_test"
     export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona"
-    export GEM_HOME="$PWD/vendor/rubygems/$(ruby -e 'puts RUBY_VERSION')"
+    export GEM_HOME="$PWD/vendor/bundle/$(ruby -e 'puts RUBY_VERSION')"
     export PATH="$GEM_HOME/bin:$PATH"
   '';
 }