diff --git a/test/plugins/cmd-returned-notify.plugin.bats b/test/plugins/cmd-returned-notify.plugin.bats
index e712cbd9e1..04edad9582 100644
--- a/test/plugins/cmd-returned-notify.plugin.bats
+++ b/test/plugins/cmd-returned-notify.plugin.bats
@@ -8,43 +8,34 @@ function local_setup_file() {
 }
 
 @test "plugins cmd-returned-notify: notify after elapsed time" {
-    export NOTIFY_IF_COMMAND_RETURNS_AFTER=0
-    export COMMAND_DURATION_START_SECONDS="${EPOCHREALTIME:-$SECONDS}"
-    sleep 1
-    run precmd_return_notification
-    assert_success
-    assert_output $'\a'
+	export NOTIFY_IF_COMMAND_RETURNS_AFTER=0
+	export COMMAND_DURATION_START_SECONDS="${EPOCHREALTIME:-$SECONDS}"
+	sleep 1
+	run precmd_return_notification
+	assert_success
+	assert_output $'\a'
 }
 
 @test "plugins cmd-returned-notify: do not notify before elapsed time" {
-    export NOTIFY_IF_COMMAND_RETURNS_AFTER=10
-    export COMMAND_DURATION_START_SECONDS="${EPOCHREALTIME:-$SECONDS}"
-    sleep 1
-    run precmd_return_notification
-    assert_success
-    assert_output $''
+	export NOTIFY_IF_COMMAND_RETURNS_AFTER=10
+	export COMMAND_DURATION_START_SECONDS="${EPOCHREALTIME:-$SECONDS}"
+	sleep 1
+	run precmd_return_notification
+	assert_success
+	assert_output $''
 }
 
-@test "plugins cmd-returned-notify: preexec no output" {
-    export COMMAND_DURATION_START_SECONDS=
-    run _command_duration_pre_exec
-    assert_success
-    assert_output ""
+@test "lib command_duration: preexec no output" {
+	export COMMAND_DURATION_START_SECONDS=
+	run _command_duration_pre_exec
+	assert_success
+	assert_output ""
 }
-
-@test "plugins cmd-returned-notify: preexec no output env set" {
-    skip "wut"
-    export COMMAND_DURATION_START_SECONDS="${EPOCHREALTIME:-$SECONDS}"
-    run _command_duration_pre_exec
-    assert_failure
-    assert_output ""
-}
-
-@test "plugins cmd-returned-notify: preexec set COMMAND_DURATION_START_SECONDS" {
-    export COMMAND_DURATION_START_SECONDS=
-    assert_equal "${COMMAND_DURATION_START_SECONDS}" ""
-    NOW="${EPOCHREALTIME:-$SECONDS}"
-    _command_duration_pre_exec
-    # We need to make sure to account for nanoseconds...
-    assert_equal "${COMMAND_DURATION_START_SECONDS%.*}" "${NOW%.*}"
+@test "lib command_duration: preexec set COMMAND_DURATION_START_SECONDS" {
+	export COMMAND_DURATION_START_SECONDS=
+	assert_equal "${COMMAND_DURATION_START_SECONDS}" ""
+	NOW="${EPOCHREALTIME:-$SECONDS}"
+	_command_duration_pre_exec
+	# We need to make sure to account for nanoseconds...
+	assert_equal "${COMMAND_DURATION_START_SECONDS%.*}" "${NOW%.*}"
 }
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 919e75599d..bffb59edd6 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -57,7 +57,7 @@ function common_setup_file() {
 function setup_libs() {
 	local lib
 	# Use a loop to allow convenient short-circuiting for some test files
-	for lib in "log" "utilities" "helpers" "search" "preexec" "colors"; do
+	for lib in "log" "utilities" "helpers" "search" "preexec" "colors" "command_duration"; do
 		load "${BASH_IT?}/lib/${lib}.bash" || return
 		# shellcheck disable=SC2015 # short-circuit if we've reached the requested library
 		[[ "${lib}" == "${1:-}" ]] && return 0 || true