diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index a3b3f6c..45446ac 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -3,6 +3,7 @@ EXTRA_DIST = \
 	e2e-test e2e-test-server \
 	e2e-test-subrs \
 	mosh-client mosh-server \
+	local.test \
 	$(displaytests) \
 	emulation-attributes.test
 
@@ -34,8 +35,8 @@ displaytests = \
 	unicode-later-combining.test \
 	window-resize.test
 
-check_PROGRAMS = ocb-aes encrypt-decrypt base64 nonce-incr
-TESTS = ocb-aes encrypt-decrypt base64 nonce-incr $(displaytests)
+check_PROGRAMS = ocb-aes encrypt-decrypt base64 nonce-incr inpty
+TESTS = ocb-aes encrypt-decrypt base64 nonce-incr local.test $(displaytests)
 XFAIL_TESTS = \
 	e2e-failure.test \
 	emulation-attributes-256color8.test
@@ -60,6 +61,10 @@ nonce_incr_SOURCES = nonce-incr.cc
 nonce_incr_CPPFLAGS = -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(srcdir)/../util $(CRYPTO_CFLAGS)
 nonce_incr_LDADD = ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(CRYPTO_LIBS)
 
+inpty_SOURCES = inpty.cc
+inpty_CPPFLAGS = -I$(srcdir)/../util
+inpty_LDADD = ../util/libmoshutil.a $(LIBUTIL)
+
 clean-local: clean-local-check
 .PHONY: clean-local-check
 clean-local-check:
diff --git a/src/tests/inpty.cc b/src/tests/inpty.cc
new file mode 100644
index 0000000..2e8c8a3
--- /dev/null
+++ b/src/tests/inpty.cc
@@ -0,0 +1,104 @@
+/*
+    Mosh: the mobile shell
+    Copyright 2012 Keith Winstein
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations including
+    the two.
+
+    You must obey the GNU General Public License in all respects for all
+    of the code used other than OpenSSL. If you modify file(s) with this
+    exception, you may extend this exception to your version of the
+    file(s), but you are not obligated to do so. If you do not wish to do
+    so, delete this exception statement from your version. If you delete
+    this exception statement from all source files in the program, then
+    also delete it here.
+*/
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#if HAVE_PTY_H
+#include <pty.h>
+#elif HAVE_UTIL_H
+#include <util.h>
+#elif HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
+
+#include "pty_compat.h"
+#include "swrite.h"
+
+int main( int argc, char *argv[] )
+{
+  if (argc < 2) {
+    fprintf( stderr, "usage: inpty COMMAND [ARGS...]\n" );
+    return 1;
+  }
+
+  struct winsize winsize;
+  memset( &winsize, 0, sizeof( winsize ) );
+  winsize.ws_col = 80;
+  winsize.ws_row = 24;
+  int master;
+  pid_t child = forkpty( &master, NULL, NULL, &winsize );
+  if ( child == -1 ) {
+    perror( "forkpty" );
+    return 1;
+  } else if ( child == 0 ) {
+    if ( execvp( argv[1], argv + 1 ) < 0 ) {
+      perror( "execve" );
+      exit( 1 );
+    }
+    exit( 0 );
+  }
+
+  while ( 1 ) {
+    char buf[ 1024 ];
+    ssize_t bytes_read = read( master, buf, sizeof( buf ) );
+    if ( bytes_read == 0 || ( bytes_read < 0 && errno == EIO ) ) { /* EOF */
+      break;
+    } else if ( bytes_read < 0 ) {
+      perror( "read" );
+      return 1;
+    }
+    swrite( STDOUT_FILENO, buf, bytes_read );
+  }
+
+  int wstatus;
+  if ( waitpid( child, &wstatus, 0 ) < 0 ) {
+    perror( "waitpid" );
+    return 1;
+  }
+
+  if ( WIFSIGNALED( wstatus ) ) {
+    fprintf( stderr, "inpty: child exited with signal %d\n", WTERMSIG( wstatus ) );
+    raise( WTERMSIG( wstatus ) );
+    return -1;
+  } else {
+    return WIFEXITED( wstatus ) ? WEXITSTATUS( wstatus ) : -1;
+  }
+}
diff --git a/src/tests/local.test b/src/tests/local.test
new file mode 100755
index 0000000..db7f0df
--- /dev/null
+++ b/src/tests/local.test
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -eu
+out=$(./inpty ../../scripts/mosh --client="../frontend/mosh-client" --server="$PWD/../frontend/mosh-server" --local --bind-server=127.0.0.1 127.0.0.1 -- printf 'he%s\n' llo)
+case "$out" in
+    *hello*) exit 0;;
+    *) exit 1;;
+esac