diff --git a/mpienv/mpibase.py b/mpienv/mpibase.py
index 4f77826..72ed2e5 100644
--- a/mpienv/mpibase.py
+++ b/mpienv/mpibase.py
@@ -112,6 +112,7 @@ def split_mpi_user_prog(cmds):
         '--preload-files-dest-dir',
         '--tmpdir', '-wd', '-wdir', '-x',
         '-tune', '--tune',
+        '--timeout',
         '-aborted', '--aborted',
         '--app', '-cf', '--cartofile',
         '-ompi-server', '--ompi-server',
diff --git a/tests/test_main.sh b/tests/test_main.sh
index 929e26a..e875294 100755
--- a/tests/test_main.sh
+++ b/tests/test_main.sh
@@ -405,7 +405,7 @@ EOF
 }
 
 
-test_reg_issue10(){
+test_reg_issue10() {
     # Regression test for #10
     # https://github.com/keisukefukuda/mpienv/issues/10
     assertSuccess mpienv autodiscover -q --add ${MPI_PREFIX}
@@ -420,6 +420,17 @@ test_reg_issue10(){
     assertEquals "\$OUT must be empty" "" "${OUT}"
 }
 
+test_reg_issue_timeout() {
+    # Regression test for
+    # https://github.com/keisukefukuda/mpienv/issues/10
+    assertSuccess mpienv autodiscover -q --add ${MPI_PREFIX}
+
+    mpienv use ${OMPI} # this command should install mpi4py to mpich-3.2
+
+    mpienv exec -host localhost:2 --timeout 200 -n 2 $PYTHON -c "from mpi4py import MPI"
+    assertTrue "$LINENO: import mpi4py should success with --timeout option" $?
+}
+
 # suite() {
 #     suite_addTest "test_mpi4py"
 #     # suite_addTest "test_mpicc"