diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index c482f27892..fbba9cc4e4 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -691,7 +691,7 @@ daemonSetupLogging(struct daemonConfig *config,
     virLogSetFromEnv();
 
     if (virLogGetNbFilters() == 0)
-        virLogParseAndDefineFilters(config->log_filters);
+        virLogSetFilters(config->log_filters);
 
     if (config->log_outputs && virLogGetNbOutputs() == 0)
         virLogSetOutputs(config->log_outputs);
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 4856cd6fb4..02745be652 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -476,7 +476,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config,
     virLogSetFromEnv();
 
     if (virLogGetNbFilters() == 0)
-        virLogParseAndDefineFilters(config->log_filters);
+        virLogSetFilters(config->log_filters);
 
     if (config->log_outputs && virLogGetNbOutputs() == 0)
         virLogSetOutputs(config->log_outputs);
diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 74dae5f67c..04bb83616d 100644
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -404,7 +404,7 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config,
     virLogSetFromEnv();
 
     if (virLogGetNbFilters() == 0)
-        virLogParseAndDefineFilters(config->log_filters);
+        virLogSetFilters(config->log_filters);
 
     if (config->log_outputs && virLogGetNbOutputs() == 0)
         virLogSetOutputs(config->log_outputs);
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 9a247eefa1..24ef0763b0 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1624,7 +1624,7 @@ virLogSetFromEnv(void)
         virLogParseDefaultPriority(debugEnv);
     debugEnv = virGetEnvAllowSUID("LIBVIRT_LOG_FILTERS");
     if (debugEnv && *debugEnv)
-        virLogParseAndDefineFilters(debugEnv);
+        virLogSetFilters(debugEnv);
     debugEnv = virGetEnvAllowSUID("LIBVIRT_LOG_OUTPUTS");
     if (debugEnv && *debugEnv)
         virLogSetOutputs(debugEnv);
diff --git a/tests/virlogtest.c b/tests/virlogtest.c
index 9d657d09ed..b2c66f7a0d 100644
--- a/tests/virlogtest.c
+++ b/tests/virlogtest.c
@@ -80,9 +80,10 @@ testLogParseFilters(const void *opaque)
 {
     int ret = -1;
     int nfilters;
+    virLogFilterPtr *filters = NULL;
     const struct testLogData *data = opaque;
 
-    nfilters = virLogParseAndDefineFilters(data->str);
+    nfilters = virLogParseFilters(data->str, &filters);
     if (nfilters < 0) {
         if (!data->pass) {
             VIR_TEST_DEBUG("Got expected error: %s\n",
@@ -102,7 +103,7 @@ testLogParseFilters(const void *opaque)
 
     ret = 0;
  cleanup:
-    virLogReset();
+    virLogFilterListFree(filters, nfilters);
     return ret;
 }