diff --git a/test/rbenv.bats b/test/rbenv.bats
index 0f305bca..5a6ef011 100644
--- a/test/rbenv.bats
+++ b/test/rbenv.bats
@@ -61,6 +61,12 @@ load test_helper
   assert_line 2 "${RBENV_ROOT}/plugins/rbenv-each/bin"
 }
 
+@test "RBENV_HOOK_PATH includes etc/rbenv.d folders" {
+  mkdir -p "$RBENV_ROOT"/plugins/rbenv-foo/etc/rbenv.d
+  run rbenv echo -F: "RBENV_HOOK_PATH"
+  assert_line 6 "${RBENV_ROOT}/plugins/rbenv-foo/etc/rbenv.d"
+}
+
 @test "RBENV_HOOK_PATH preserves value from environment" {
   RBENV_HOOK_PATH=/my/hook/path:/other/hooks run rbenv echo -F: "RBENV_HOOK_PATH"
   assert_success