diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c
index 6a2487b02bfd8e56d1d5b53ef5fcc224aa2b2ca5..7e7945558c358aa39cf7a7bb37618994926c4afa 100644
--- a/lnet/selftest/framework.c
+++ b/lnet/selftest/framework.c
@@ -215,6 +215,12 @@ sfw_session_removed (void)
         return (sfw_data.fw_session == NULL) ? 1 : 0;
 }
 
+void
+sfw_set_session_timeout (int timeout)
+{
+        session_timeout = timeout;
+}
+
 #endif
 
 void
diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h
index 72cc17a18d8a2a5a15e96aadf5e2ba5a140dff33..b759e6a1ebbf74e7e40995926267aa15b88e8172 100644
--- a/lnet/selftest/selftest.h
+++ b/lnet/selftest/selftest.h
@@ -516,6 +516,8 @@ swi_state2str (int state)
 #ifndef __KERNEL__
 
 int stt_poll_interval(void);
+int sfw_session_removed(void);
+void sfw_set_session_timeout(int timeout);
 
 int stt_check_events(void);
 int swi_check_events(void);
diff --git a/lnet/utils/lstclient.c b/lnet/utils/lstclient.c
index 075872bfa71f81e4024e55fab71e1ff8772c9b3b..61a213a4aa6bbe7659b2cac07c9bf1bb986c7081 100644
--- a/lnet/utils/lstclient.c
+++ b/lnet/utils/lstclient.c
@@ -21,8 +21,6 @@ static int lstjn_intialized = 0;
 unsigned int libcfs_subsystem_debug = ~0 - (S_LNET | S_LND);
 unsigned int libcfs_debug = 0;
 
-extern int sfw_session_removed(void);
-
 static struct option lstjn_options[] =
 {
         {"sesid",   required_argument,  0, 's' },