diff --git a/libexec/rbenv-init b/libexec/rbenv-init
index dcb1bd5a..a3292d66 100755
--- a/libexec/rbenv-init
+++ b/libexec/rbenv-init
@@ -77,7 +77,7 @@ if [ -z "$print" ]; then
     echo
     case "$shell" in
     fish )
-      echo '. (rbenv init -|psub)'
+      echo 'status --is-interactive; and . (rbenv init -|psub)'
       ;;
     * )
       echo 'eval "$(rbenv init -)"'
diff --git a/test/init.bats b/test/init.bats
index 54086e5f..61b30be7 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -38,6 +38,12 @@ load test_helper
   assert_line ". '${root}/libexec/../completions/rbenv.fish'"
 }
 
+@test "fish instructions" {
+  run rbenv-init fish
+  assert [ "$status" -eq 1 ]
+  assert_line 'status --is-interactive; and . (rbenv init -|psub)'
+}
+
 @test "option to skip rehash" {
   run rbenv-init - --no-rehash
   assert_success