diff --git a/commands b/commands
index 691899f..9d3f7d9 100755
--- a/commands
+++ b/commands
@@ -169,9 +169,10 @@ case "$1" in
     verify_service_name "$2"
     SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
     SERVICE_NAME="$(get_service_name "$SERVICE")"
-
     PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
-    docker exec -it "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" --database="$SERVICE"
+    has_tty && SERVICE_TTY_OPTS="-t"
+
+    docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" --database="$SERVICE"
     ;;
 
   $PLUGIN_COMMAND_PREFIX:info)
diff --git a/tests/service_connect.bats b/tests/service_connect.bats
index d57f5b1..cd931a4 100755
--- a/tests/service_connect.bats
+++ b/tests/service_connect.bats
@@ -25,6 +25,6 @@ teardown() {
   export ECHO_DOCKER_COMMAND="true"
   run dokku "$PLUGIN_COMMAND_PREFIX:connect" l
   password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")"
-  assert_output "docker exec -it dokku.mysql.l mysql --user=mysql --password=$password --database=l"
+  assert_output "docker exec -i -t dokku.mysql.l mysql --user=mysql --password=$password --database=l"
 }