diff --git a/test/test-logger.c b/test/test-logger.c
index 47ce6fd64..4af9801db 100644
--- a/test/test-logger.c
+++ b/test/test-logger.c
@@ -122,10 +122,137 @@ PWTEST(logger_no_ansi)
 	return PWTEST_PASS;
 }
 
+static void
+test_log_levels(enum spa_log_level level)
+{
+	struct pwtest_spa_plugin *plugin;
+	void *iface;
+	char fname[PATH_MAX];
+	struct spa_dict_item items[2];
+	struct spa_dict info;
+	char buffer[1024];
+	FILE *fp;
+	bool above_level_found = false;
+	bool below_level_found = false;
+	bool current_level_found = false;
+
+	pw_init(0, NULL);
+	pwtest_mkstemp(fname);
+	items[0] = SPA_DICT_ITEM_INIT(SPA_KEY_LOG_FILE, fname);
+	items[1] = SPA_DICT_ITEM_INIT(SPA_KEY_LOG_COLORS, "true");
+	info = SPA_DICT_INIT(items, 2);
+	plugin = pwtest_spa_plugin_new();
+	iface = pwtest_spa_plugin_load_interface(plugin, "support/libspa-support",
+						 SPA_NAME_SUPPORT_LOG, SPA_TYPE_INTERFACE_Log,
+						 &info);
+	pwtest_ptr_notnull(iface);
+	pw_log_set(iface);
+
+	/* current level is whatever the iteration is. Log one line
+	 * with our level, one with a level above (should never show up)
+	 * and one with a level below (should show up).
+	 */
+	if (level > SPA_LOG_LEVEL_NONE) {
+		pw_log(level, "CURRENT");
+		pw_log(level - 1, "BELOW");
+	}
+	if (level < SPA_LOG_LEVEL_TRACE)
+		pw_log(level + 1, "ABOVE");
+
+	fp = fopen(fname, "r");
+	while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+		if (strstr(buffer, "CURRENT"))
+			current_level_found = true;
+		else if (strstr(buffer, "ABOVE"))
+			above_level_found = true;
+		else if (strstr(buffer, "BELOW"))
+			below_level_found = true;
+	}
+
+	fclose(fp);
+
+	/* Anything on a higher level than ours should never show up */
+	pwtest_bool_false(above_level_found);
+	if (level == SPA_LOG_LEVEL_NONE) {
+		pwtest_bool_false(current_level_found);
+		pwtest_bool_false(below_level_found);
+	} else {
+		pwtest_bool_true(current_level_found);
+		pwtest_bool_true(below_level_found);
+	}
+	pwtest_spa_plugin_destroy(plugin);
+}
+
+PWTEST(logger_levels)
+{
+	enum spa_log_level level = pwtest_get_iteration(current_test);
+	enum spa_log_level default_level = pw_log_level;
+	struct spa_log *default_logger = pw_log_get();
+	char *oldenv = getenv("PIPEWIRE_DEBUG");
+
+	if (oldenv)
+		oldenv = strdup(oldenv);
+	unsetenv("PIPEWIRE_DEBUG");
+
+	pw_log_set_level(level);
+
+	test_log_levels(level);
+
+	if (oldenv) {
+		setenv("PIPEWIRE_DEBUG", oldenv, 1);
+		free(oldenv);
+	}
+
+	pw_log_set(default_logger);
+	pw_log_set_level(default_level);
+	pw_deinit();
+
+	return PWTEST_PASS;
+}
+
+PWTEST(logger_debug_env)
+{
+	enum spa_log_level level = pwtest_get_iteration(current_test);
+	enum spa_log_level default_level = pw_log_level;
+	struct spa_log *default_logger = pw_log_get();
+	char lvl[2] = {0};
+	char *oldenv = getenv("PIPEWIRE_DEBUG");
+
+	if (oldenv)
+		oldenv = strdup(oldenv);
+
+	spa_scnprintf(lvl, sizeof(lvl), "%d", level);
+	setenv("PIPEWIRE_DEBUG", lvl, 1);
+
+	/* Disable logging, let PIPEWIRE_DEBUG set the level */
+	pw_log_set_level(SPA_LOG_LEVEL_NONE);
+
+	test_log_levels(level);
+
+	if (oldenv) {
+		setenv("PIPEWIRE_DEBUG", oldenv, 1);
+		free(oldenv);
+	} else {
+		unsetenv("PIPEWIRE_DEBUG");
+	}
+
+	pw_log_set(default_logger);
+	pw_log_set_level(default_level);
+	pw_deinit();
+
+	return PWTEST_PASS;
+}
+
 PWTEST_SUITE(logger)
 {
 	pwtest_add(logger_truncate_long_lines, PWTEST_NOARG);
 	pwtest_add(logger_no_ansi, PWTEST_NOARG);
+	pwtest_add(logger_levels,
+		   PWTEST_ARG_RANGE, SPA_LOG_LEVEL_NONE, SPA_LOG_LEVEL_TRACE + 1,
+		   PWTEST_NOARG);
+	pwtest_add(logger_debug_env,
+		   PWTEST_ARG_RANGE, SPA_LOG_LEVEL_NONE, SPA_LOG_LEVEL_TRACE + 1,
+		   PWTEST_NOARG);
 
 	return PWTEST_PASS;
 }