diff --git a/doc/man/man1/sinfo.1 b/doc/man/man1/sinfo.1
index 6b72297b6aaf79bfa0f2a1a432b2fde6e040efa6..c28c9cd8ea32658800d94c58cf3c2993cc260a5a 100644
--- a/doc/man/man1/sinfo.1
+++ b/doc/man/man1/sinfo.1
@@ -325,6 +325,7 @@ Number of cores per socket.
 .TP
 \fBdefaulttime\fR
 Default time for any job in the format "days\-hours:minutes:seconds".
+.TP
 \fBdisk\fR
 Size of temporary disk space per node in megabytes.
 .TP
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index d17be916c289a2171cefcf752964301fca324dd4..dc118039d54535b8fe016a994cc16ffa1d5457a3 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -3765,6 +3765,70 @@ proc get_partition_nodes {partition states} {
 	return $node_list
 }
 
+#####################################################################
+#
+# Proc: get_partition_default_time_limit
+#
+# Purpose: Get the default time limit in a given partition
+#
+# Input:   partition - partition to default time limit of
+#
+# Returns: time limit in seconds, -1 if undefined or error
+#
+#####################################################################
+
+proc get_partition_default_time_limit {partition} {
+
+	global sinfo number
+
+	if {[string length $partition] == 0} {
+		set partition [default_partition]
+	}
+
+	set secs 0
+	log_user 0
+	set sinfo_pid [spawn -noecho $sinfo -h -p $partition -O defaulttime -e]
+	expect {
+		-re "n/a" {
+			set secs -1
+			exp_continue
+		}
+		-re "($number)-($number):($number):($number)" {
+			set days  [expr $expect_out(1,string) * 24 * 60 * 60]
+			set hours [expr $expect_out(2,string) * 60 * 60]
+			set mins  [expr $expect_out(3,string) * 60]
+			set secs  [expr $days + $hours + $mins + $expect_out(4,string)]
+			exp_continue
+		}
+		-re "($number):($number):($number)" {
+			set hours [expr $expect_out(1,string) * 60 * 60]
+			set mins  [expr $expect_out(2,string) * 60]
+			set secs  [expr $hours + $mins + $expect_out(3,string)]
+			exp_continue
+		}
+		-re "($number):($number)" {
+			set mins  [expr $expect_out(1,string) * 60]
+			set secs  [expr $mins + $expect_out(2,string)]
+			exp_continue
+		}
+		-re "($number)" {
+			set secs  [expr $expect_out(1,string) * 60]
+			exp_continue
+		}
+		timeout {
+			send_user "\nFAILURE: sinfo not responding\n"
+			slow_kill $sinfo_pid
+			set exit_code 1
+		}
+		eof {
+			wait
+		}
+	}
+
+	log_user 1
+	return $secs
+}
+
 #####################################################################
 #
 # Proc: get_node_cores
diff --git a/testsuite/expect/test1.105 b/testsuite/expect/test1.105
index 20b05997f38b494dae7c79f3fc934009d24128c3..e4fdc2bd9e6fd4b551290cc3ada3cd05c96b80e0 100755
--- a/testsuite/expect/test1.105
+++ b/testsuite/expect/test1.105
@@ -36,6 +36,13 @@ set job_id      0
 
 print_header $test_id
 
+set part_name [default_partition]
+set default_time [get_partition_default_time_limit $part_name]
+if { $default_time != -1} {
+	send_user "\nWARNING: This test is not compatible with default partition having a default time limit ($part_name $default_time)\n"
+	exit $exit_code
+}
+
 #
 # Spawn a job with a deadline and no time
 #
diff --git a/testsuite/expect/test15.33 b/testsuite/expect/test15.33
index ea144698f5dfee937e33d395b1b1765dc2796a39..9bd4b1b2fdd167337d1de07319577a25bd7f502f 100755
--- a/testsuite/expect/test15.33
+++ b/testsuite/expect/test15.33
@@ -36,6 +36,13 @@ set job_id      0
 
 print_header $test_id
 
+set part_name [default_partition]
+set default_time [get_partition_default_time_limit $part_name]
+if { $default_time != -1} {
+	send_user "\nWARNING: This test is not compatible with default partition having a default time limit ($part_name $default_time)\n"
+	exit $exit_code
+}
+
 #
 # Spawn a batch job with a deadline and no time
 #
diff --git a/testsuite/expect/test17.56 b/testsuite/expect/test17.56
index b0e2ff78f90948bd867db36c2be7612925e9a112..76bc5138507881b5dec4290a10253890292529cf 100755
--- a/testsuite/expect/test17.56
+++ b/testsuite/expect/test17.56
@@ -37,6 +37,13 @@ set job_id      0
 
 print_header $test_id
 
+set part_name [default_partition]
+set default_time [get_partition_default_time_limit $part_name]
+if { $default_time != -1} {
+	send_user "\nWARNING: This test is not compatible with default partition having a default time limit ($part_name $default_time)\n"
+	exit $exit_code
+}
+
 #
 # Build input script file
 #