diff --git a/sjsonnet/test/resources/test_suite/error.std_maxArray.jsonnet b/sjsonnet/test/resources/test_suite/error.std_maxArray.jsonnet
new file mode 100644
index 00000000..1028fa0b
--- /dev/null
+++ b/sjsonnet/test/resources/test_suite/error.std_maxArray.jsonnet
@@ -0,0 +1 @@
+std.maxArray([])
diff --git a/sjsonnet/test/resources/test_suite/error.std_maxArray.jsonnet.golden b/sjsonnet/test/resources/test_suite/error.std_maxArray.jsonnet.golden
new file mode 100644
index 00000000..717fd1ff
--- /dev/null
+++ b/sjsonnet/test/resources/test_suite/error.std_maxArray.jsonnet.golden
@@ -0,0 +1,4 @@
+RUNTIME ERROR: Expected at least one element in array. Got none
+	std.jsonnet:<stdlib_position_redacted>	thunk <onEmpty>
+	std.jsonnet:<stdlib_position_redacted>	function <anonymous>
+	error.std_maxArray.jsonnet:1:1-17
\ No newline at end of file
diff --git a/sjsonnet/test/resources/test_suite/error.std_minArray.jsonnet  b/sjsonnet/test/resources/test_suite/error.std_minArray.jsonnet 
new file mode 100644
index 00000000..11ff98a5
--- /dev/null
+++ b/sjsonnet/test/resources/test_suite/error.std_minArray.jsonnet 	
@@ -0,0 +1 @@
+std.minArray([])
\ No newline at end of file
diff --git a/sjsonnet/test/resources/test_suite/error.std_minArray.jsonnet.golden  b/sjsonnet/test/resources/test_suite/error.std_minArray.jsonnet.golden 
new file mode 100644
index 00000000..08c87559
--- /dev/null
+++ b/sjsonnet/test/resources/test_suite/error.std_minArray.jsonnet.golden 	
@@ -0,0 +1,4 @@
+RUNTIME ERROR: Expected at least one element in array. Got none
+	std.jsonnet:<stdlib_position_redacted>	thunk <onEmpty>
+	std.jsonnet:<stdlib_position_redacted>	function <anonymous>
+	error.std_minArray.jsonnet:1:1-17
diff --git a/sjsonnet/test/resources/test_suite/stdlib.jsonnet b/sjsonnet/test/resources/test_suite/stdlib.jsonnet
index 3945058e..2b83385b 100644
--- a/sjsonnet/test/resources/test_suite/stdlib.jsonnet
+++ b/sjsonnet/test/resources/test_suite/stdlib.jsonnet
@@ -1586,10 +1586,18 @@ std.assertEqual(std.avg([1, 1, 2.5]), 1.5) &&
 
 std.assertEqual(std.minArray([1, 2, 3]), 1) &&
 std.assertEqual(std.minArray(['1', '2', '3']), '1') &&
+std.assertEqual(std.minArray([3, 1, 2]), 1) &&
+std.assertEqual(std.minArray(['3', '1', '2']), '1') &&
+std.assertEqual(std.minArray(['a2', 'b1'], keyF=function(x) x[0]), 'a2') &&
+std.assertEqual(std.minArray(['a2', 'b1'], keyF=function(x) x[1]), 'b1') &&
+std.assertEqual(std.minArray([], onEmpty='default'), 'default') &&
 
 std.assertEqual(std.maxArray([1, 2, 3]), 3) &&
 std.assertEqual(std.maxArray(['1', '2', '3']), '3') &&
 std.assertEqual(std.maxArray(['a', 'x', 'z']), 'z') &&
+std.assertEqual(std.maxArray(['a2', 'b1'], keyF=function(x) x[0]), 'b1') &&
+std.assertEqual(std.maxArray(['a2', 'b1'], keyF=function(x) x[1]), 'a2') &&
+std.assertEqual(std.maxArray([], onEmpty='default'), 'default') &&
 
 std.assertEqual(std.xor(true, false), true) &&
 std.assertEqual(std.xor(true, true), false) &&