diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index b4e8203eebe..5e899770857 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -1322,7 +1322,7 @@ static HRESULT WINAPI DefaultHandler_Run(
 
   release_delegates(This);
 
-  hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_ALL,
+  hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER,
                         &IID_IOleObject, (void **)&This->pOleDelegate);
   if (FAILED(hr))
     return hr;
diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c
index 8091bc6bfd2..5da7ced074a 100644
--- a/dlls/ole32/tests/defaulthandler.c
+++ b/dlls/ole32/tests/defaulthandler.c
@@ -36,9 +36,6 @@
 #define SET_EXPECT(func) \
     expect_ ## func = TRUE
 
-#define GET_EXPECT(func) \
-    expect_ ## func
-
 #define CHECK_EXPECT2(func) \
     do { \
         ok(expect_ ##func, "unexpected call " #func "\n"); \
@@ -184,12 +181,6 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r
         *ppv = NULL;
         return E_NOINTERFACE;
     }else if(IsEqualGUID(riid, &IID_IClassFactory)) {
-        if(!GET_EXPECT(CF_QueryInterface_ClassFactory)) {
-            todo_wine CHECK_EXPECT(CF_QueryInterface_ClassFactory);
-            *ppv = NULL;
-            return E_NOINTERFACE;
-        }
-
         CHECK_EXPECT(CF_QueryInterface_ClassFactory);
         *ppv = iface;
         return S_OK;
@@ -268,7 +259,7 @@ static void test_default_handler_run(void)
     IUnknown_Release(unk);
 
     hres = IRunnableObject_Run(ro, NULL);
-    todo_wine ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres);
+    ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres);
     IRunnableObject_Release(ro);
 
     CoRevokeClassObject(class_reg);