diff --git a/testsuite/expect/test2.10 b/testsuite/expect/test2.10
new file mode 100755
index 0000000000000000000000000000000000000000..e18420104b1076432d1a795c595cb06e93da46fc
--- /dev/null
+++ b/testsuite/expect/test2.10
@@ -0,0 +1,88 @@
+#!/usr/bin/expect
+############################################################################
+# Purpose: Test of SLURM functionality
+#          Validate scontrol oneliner mode (--oneliner option).
+#
+# Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
+#          "FAILURE: ..." otherwise with an explanation of the failure, OR
+#          anything else indicates a failure mode that must be investigated.
+############################################################################
+# Copyright (C) 2002 The Regents of the University of California.
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Moe Jette <jette1@llnl.gov>
+# UCRL-CODE-2002-040.
+# 
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.llnl.gov/linux/slurm/>.
+#  
+# SLURM 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 2 of the License, or (at your option)
+# any later version.
+# 
+# SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+############################################################################
+source ./globals
+
+set test_id     "2.10"
+set exit_code   0
+
+print_header $test_id
+
+#
+# Report all slurm nodes, multi-line (default) mode
+#
+set matches     0
+spawn $scontrol show node
+expect {
+	-re "  Weight=" {
+		set matches 1
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: scontrol not responding\n"
+		set exit_code 1
+	}
+	eof {
+		wait
+	}
+}
+if {$matches != 1} {
+	send_user "\nFAILURE: scontrol show node command failed\n"
+	set exit_code 1
+}
+
+#
+# Report all slurm nodes, one record per line mode
+#
+set matches     0
+spawn $scontrol --oneliner show node
+expect {
+	-re "  Weight=" {
+		set matches 1
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: scontrol not responding\n"
+		set exit_code 1
+	}
+	eof {
+		wait
+	}
+}
+if {$matches != 0} {
+	send_user "\nFAILURE: scontrol --oneliner mode failed\n"
+	set exit_code 1
+}
+
+if {$exit_code == 0} {
+	send_user "\nSUCCESS\n"
+}
+exit $exit_code