diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c
index 65691f4705f..02b89dc549b 100644
--- a/dlls/dmime/audiopath.c
+++ b/dlls/dmime/audiopath.c
@@ -23,7 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
 
 struct IDirectMusicAudioPathImpl {
     IDirectMusicAudioPath IDirectMusicAudioPath_iface;
-    struct dmobject dmobj;
     LONG ref;
     IDirectMusicPerformance8* pPerf;
     IDirectMusicGraph*        pToolGraph;
@@ -33,14 +32,21 @@ struct IDirectMusicAudioPathImpl {
     BOOL fActive;
 };
 
+struct audio_path_config
+{
+    IUnknown IUnknown_iface;
+    struct dmobject dmobj;
+    LONG ref;
+};
+
 static inline struct IDirectMusicAudioPathImpl *impl_from_IDirectMusicAudioPath(IDirectMusicAudioPath *iface)
 {
     return CONTAINING_RECORD(iface, struct IDirectMusicAudioPathImpl, IDirectMusicAudioPath_iface);
 }
 
-static inline struct IDirectMusicAudioPathImpl *impl_from_IPersistStream(IPersistStream *iface)
+static inline struct audio_path_config *impl_from_IPersistStream(IPersistStream *iface)
 {
-    return CONTAINING_RECORD(iface, struct IDirectMusicAudioPathImpl, dmobj.IPersistStream_iface);
+    return CONTAINING_RECORD(iface, struct audio_path_config, dmobj.IPersistStream_iface);
 }
 
 void set_audiopath_perf_pointer(IDirectMusicAudioPath *iface, IDirectMusicPerformance8 *performance)
@@ -74,10 +80,6 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_QueryInterface (IDirectMusicAudi
 
     if (IsEqualIID (riid, &IID_IDirectMusicAudioPath) || IsEqualIID (riid, &IID_IUnknown))
         *ppobj = &This->IDirectMusicAudioPath_iface;
-    else if (IsEqualIID (riid, &IID_IDirectMusicObject))
-        *ppobj = &This->dmobj.IDirectMusicObject_iface;
-    else if (IsEqualIID (riid, &IID_IPersistStream))
-        *ppobj = &This->dmobj.IPersistStream_iface;
 
     if (*ppobj) {
         IUnknown_AddRef((IUnknown*)*ppobj);
@@ -255,7 +257,7 @@ static const IDirectMusicAudioPathVtbl DirectMusicAudioPathVtbl = {
 };
 
 /* IDirectMusicObject */
-static HRESULT WINAPI path_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface,
+static HRESULT WINAPI path_config_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface,
         IStream *stream, DMUS_OBJECTDESC *desc)
 {
     struct chunk_entry riff = {0};
@@ -294,13 +296,13 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = {
     dmobj_IDirectMusicObject_Release,
     dmobj_IDirectMusicObject_GetDescriptor,
     dmobj_IDirectMusicObject_SetDescriptor,
-    path_IDirectMusicObject_ParseDescriptor
+    path_config_IDirectMusicObject_ParseDescriptor
 };
 
 /* IPersistStream */
-static HRESULT WINAPI path_IPersistStream_Load(IPersistStream *iface, IStream *stream)
+static HRESULT WINAPI path_config_IPersistStream_Load(IPersistStream *iface, IStream *stream)
 {
-    struct IDirectMusicAudioPathImpl *This = impl_from_IPersistStream(iface);
+    struct audio_path_config *This = impl_from_IPersistStream(iface);
 
     FIXME("(%p, %p): Loading not implemented yet\n", This, stream);
 
@@ -314,11 +316,64 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    path_IPersistStream_Load,
+    path_config_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
 
+static inline struct audio_path_config *impl_from_IUnknown(IUnknown *iface)
+{
+    return CONTAINING_RECORD(iface, struct audio_path_config, IUnknown_iface);
+}
+
+static HRESULT WINAPI path_config_IUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppobj)
+{
+    struct audio_path_config *This = impl_from_IUnknown(iface);
+
+    TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
+
+    *ppobj = NULL;
+
+    if (IsEqualIID (riid, &IID_IUnknown))
+        *ppobj = &This->IUnknown_iface;
+    else if (IsEqualIID (riid, &IID_IDirectMusicObject))
+        *ppobj = &This->dmobj.IDirectMusicObject_iface;
+    else if (IsEqualIID (riid, &IID_IPersistStream))
+        *ppobj = &This->dmobj.IPersistStream_iface;
+
+    if (*ppobj)
+    {
+        IUnknown_AddRef((IUnknown*)*ppobj);
+        return S_OK;
+    }
+
+    WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj);
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI path_config_IUnknown_AddRef(IUnknown *unk)
+{
+    struct audio_path_config *This = impl_from_IUnknown(unk);
+    return InterlockedIncrement(&This->ref);
+}
+
+static ULONG WINAPI path_config_IUnknown_Release(IUnknown *unk)
+{
+    struct audio_path_config *This = impl_from_IUnknown(unk);
+    ULONG ref = InterlockedDecrement(&This->ref);
+
+    if (!ref)
+        free(This);
+    return ref;
+}
+
+static const IUnknownVtbl path_config_unk_vtbl =
+{
+    path_config_IUnknown_QueryInterface,
+    path_config_IUnknown_AddRef,
+    path_config_IUnknown_Release,
+};
+
 /* for ClassFactory */
 HRESULT create_dmaudiopath(REFIID riid, void **ppobj)
 {
@@ -329,12 +384,26 @@ HRESULT create_dmaudiopath(REFIID riid, void **ppobj)
     if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY;
     obj->IDirectMusicAudioPath_iface.lpVtbl = &DirectMusicAudioPathVtbl;
     obj->ref = 1;
-    dmobject_init(&obj->dmobj, &CLSID_DirectMusicAudioPathConfig,
-            (IUnknown *)&obj->IDirectMusicAudioPath_iface);
-    obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl;
-    obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
 
     hr = IDirectMusicAudioPath_QueryInterface(&obj->IDirectMusicAudioPath_iface, riid, ppobj);
     IDirectMusicAudioPath_Release(&obj->IDirectMusicAudioPath_iface);
     return hr;
 }
+
+HRESULT create_dmaudiopath_config(REFIID riid, void **ppobj)
+{
+    struct audio_path_config *obj;
+    HRESULT hr;
+
+    *ppobj = NULL;
+    if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY;
+    dmobject_init(&obj->dmobj, &CLSID_DirectMusicAudioPathConfig, &obj->IUnknown_iface);
+    obj->IUnknown_iface.lpVtbl = &path_config_unk_vtbl;
+    obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl;
+    obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
+    obj->ref = 1;
+
+    hr = IUnknown_QueryInterface(&obj->IUnknown_iface, riid, ppobj);
+    IUnknown_Release(&obj->IUnknown_iface);
+    return hr;
+}
diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c
index 89e70bcd1bd..05d094fc2a2 100644
--- a/dlls/dmime/dmime_main.c
+++ b/dlls/dmime/dmime_main.c
@@ -120,7 +120,7 @@ static IClassFactoryImpl ParamControlTrack_CF = {{&classfactory_vtbl}, create_dm
 static IClassFactoryImpl MarkerTrack_CF = {{&classfactory_vtbl}, create_dmmarkertrack};
 static IClassFactoryImpl LyricsTrack_CF = {{&classfactory_vtbl}, create_dmlyricstrack};
 static IClassFactoryImpl SegTriggerTrack_CF = {{&classfactory_vtbl}, create_dmsegtriggertrack};
-static IClassFactoryImpl AudioPath_CF = {{&classfactory_vtbl}, create_dmaudiopath};
+static IClassFactoryImpl AudioPathConfig_CF = {{&classfactory_vtbl}, create_dmaudiopath_config};
 static IClassFactoryImpl WaveTrack_CF = {{&classfactory_vtbl}, create_dmwavetrack};
 
 
@@ -182,7 +182,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 		return S_OK;
         } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicAudioPathConfig) &&
                    IsEqualIID (riid, &IID_IClassFactory)) {
-                *ppv = &AudioPath_CF;
+                *ppv = &AudioPathConfig_CF;
 		IClassFactory_AddRef((IClassFactory*)*ppv);
 		return S_OK;
 	} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicWaveTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index ed1589ece1a..7b744419c38 100644
--- a/dlls/dmime/dmime_private.h
+++ b/dlls/dmime/dmime_private.h
@@ -57,6 +57,7 @@ extern HRESULT create_dmsegment(REFIID riid, void **ret_iface);
 extern HRESULT create_dmsegmentstate(REFIID riid, void **ret_iface);
 extern HRESULT create_dmgraph(REFIID riid, void **ret_iface);
 extern HRESULT create_dmaudiopath(REFIID riid, void **ret_iface);
+extern HRESULT create_dmaudiopath_config(REFIID riid, void **ret_iface);
 
 extern HRESULT create_dmlyricstrack(REFIID riid, void **ret_iface);
 extern HRESULT create_dmmarkertrack(REFIID riid, void **ret_iface);
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index f5ae845cf97..2b7c744acdb 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -908,12 +908,10 @@ static void test_COM_audiopath(void)
 
     /* IDirectMusicObject and IPersistStream are not supported */
     hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IDirectMusicObject, (void**)&unk);
-    todo_wine ok(FAILED(hr) && !unk, "Unexpected IDirectMusicObject interface: hr=%#lx, iface=%p\n",
-            hr, unk);
+    ok(FAILED(hr) && !unk, "Unexpected IDirectMusicObject interface: hr=%#lx, iface=%p\n", hr, unk);
     if (unk) IUnknown_Release(unk);
     hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IPersistStream, (void**)&unk);
-    todo_wine ok(FAILED(hr) && !unk, "Unexpected IPersistStream interface: hr=%#lx, iface=%p\n",
-            hr, unk);
+    ok(FAILED(hr) && !unk, "Unexpected IPersistStream interface: hr=%#lx, iface=%p\n", hr, unk);
     if (unk) IUnknown_Release(unk);
 
     /* Same refcount for all DirectMusicAudioPath interfaces */
@@ -988,7 +986,7 @@ static void test_COM_audiopathconfig(void)
     /* IDirectMusicAudioPath not supported */
     hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER,
             &IID_IDirectMusicAudioPath, (void**)&dmap);
-    todo_wine ok(FAILED(hr) && !dmap,
+    ok(FAILED(hr) && !dmap,
             "Unexpected IDirectMusicAudioPath interface: hr=%#lx, iface=%p\n", hr, dmap);
 
     /* IDirectMusicObject and IPersistStream supported */
@@ -1018,8 +1016,8 @@ static void test_COM_audiopathconfig(void)
 
     /* IDirectMusicAudioPath still not supported */
     hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicAudioPath, (void**)&dmap);
-    todo_wine ok(FAILED(hr) && !dmap,
-            "Unexpected IDirectMusicAudioPath interface: hr=%#lx, iface=%p\n", hr, dmap);
+    ok(FAILED(hr) && !dmap,
+        "Unexpected IDirectMusicAudioPath interface: hr=%#lx, iface=%p\n", hr, dmap);
 
     while (IDirectMusicObject_Release(dmo));
 }