diff --git a/test/compliance.spec.ts b/test/compliance.spec.ts
index d5e364ac..9984a07a 100644
--- a/test/compliance.spec.ts
+++ b/test/compliance.spec.ts
@@ -1,7 +1,7 @@
 import { TypedEventEmitter } from '@libp2p/interface'
 import tests from '@libp2p/interface-compliance-tests/pubsub'
 import { defaultLogger } from '@libp2p/logger'
-import { PersistentPeerStore } from '@libp2p/peer-store'
+import { persistentPeerStore } from '@libp2p/peer-store'
 import { MemoryDatastore } from 'datastore-core'
 import { GossipSub } from '../src/index.js'
 import type { Libp2pEvents } from '@libp2p/interface'
@@ -18,7 +18,7 @@ describe.skip('interface compliance', function () {
       const pubsub = new GossipSub(
         {
           ...args.components,
-          peerStore: new PersistentPeerStore({
+          peerStore: persistentPeerStore({
             peerId: args.components.peerId,
             datastore: new MemoryDatastore(),
             events: new TypedEventEmitter<Libp2pEvents>(),
diff --git a/test/e2e/go-gossipsub.spec.ts b/test/e2e/go-gossipsub.spec.ts
index 190b6c4c..03c48018 100644
--- a/test/e2e/go-gossipsub.spec.ts
+++ b/test/e2e/go-gossipsub.spec.ts
@@ -1,4 +1,4 @@
-import { FloodSub } from '@libp2p/floodsub'
+import { floodsub } from '@libp2p/floodsub'
 import { type Message, TopicValidatorResult, type Libp2pEvents } from '@libp2p/interface'
 import { stop } from '@libp2p/interface'
 import { mockNetwork } from '@libp2p/interface-compliance-tests/mocks'
@@ -693,7 +693,7 @@ describe('go-libp2p-pubsub gossipsub tests', function () {
     })
     const fsubs = await createComponentsArray({
       number: 10,
-      pubsub: FloodSub
+      pubsub: floodsub
     })
     psubs = gsubs.concat(fsubs)
 
diff --git a/test/floodsub.spec.ts b/test/floodsub.spec.ts
index 078ddf1a..4c05f37c 100644
--- a/test/floodsub.spec.ts
+++ b/test/floodsub.spec.ts
@@ -1,4 +1,4 @@
-import { FloodSub } from '@libp2p/floodsub'
+import { floodsub } from '@libp2p/floodsub'
 import { stop } from '@libp2p/interface'
 import { mockNetwork } from '@libp2p/interface-compliance-tests/mocks'
 import { expect } from 'aegir/chai'
@@ -23,7 +23,7 @@ describe('gossipsub fallbacks to floodsub', () => {
         }
       })
       nodeFs = await createComponents({
-        pubsub: FloodSub
+        pubsub: floodsub
       })
     })
 
@@ -61,7 +61,7 @@ describe('gossipsub fallbacks to floodsub', () => {
         }
       })
       nodeFs = await createComponents({
-        pubsub: FloodSub
+        pubsub: floodsub
       })
     })
 
@@ -97,7 +97,7 @@ describe('gossipsub fallbacks to floodsub', () => {
         }
       })
       nodeFs = await createComponents({
-        pubsub: FloodSub
+        pubsub: floodsub
       })
 
       await connectPubsubNodes(nodeGs, nodeFs)
@@ -158,7 +158,7 @@ describe('gossipsub fallbacks to floodsub', () => {
         }
       })
       nodeFs = await createComponents({
-        pubsub: FloodSub
+        pubsub: floodsub
       })
 
       await connectPubsubNodes(nodeGs, nodeFs)
@@ -227,7 +227,7 @@ describe('gossipsub fallbacks to floodsub', () => {
         }
       })
       nodeFs = await createComponents({
-        pubsub: FloodSub
+        pubsub: floodsub
       })
 
       await connectPubsubNodes(nodeGs, nodeFs)
diff --git a/test/utils/create-pubsub.ts b/test/utils/create-pubsub.ts
index eb564592..a580b1b8 100644
--- a/test/utils/create-pubsub.ts
+++ b/test/utils/create-pubsub.ts
@@ -4,16 +4,17 @@ import { TypedEventEmitter, start } from '@libp2p/interface'
 import { mockRegistrar, mockConnectionManager, mockNetwork } from '@libp2p/interface-compliance-tests/mocks'
 import { defaultLogger } from '@libp2p/logger'
 import { peerIdFromPrivateKey } from '@libp2p/peer-id'
-import { PersistentPeerStore } from '@libp2p/peer-store'
+import { persistentPeerStore } from '@libp2p/peer-store'
 import { MemoryDatastore } from 'datastore-core'
 import { stubInterface } from 'sinon-ts'
-import { GossipSub, type GossipSubComponents, type GossipsubOpts } from '../../src/index.js'
-import type { TypedEventTarget, Libp2pEvents, PubSub } from '@libp2p/interface'
+import { gossipsub, GossipSub, type GossipSubComponents, type GossipsubOpts } from '../../src/index.js'
+import type { TypedEventTarget, Libp2pEvents } from '@libp2p/interface'
 import type { ConnectionManager } from '@libp2p/interface-internal'
+import type { floodsub } from '@libp2p/floodsub'
 
 export interface CreateComponentsOpts {
   init?: Partial<GossipsubOpts>
-  pubsub?: { new (opts?: any): PubSub }
+  pubsub?: typeof floodsub
 }
 
 export interface GossipSubTestComponents extends GossipSubComponents {
@@ -26,7 +27,7 @@ export interface GossipSubAndComponents {
 }
 
 export const createComponents = async (opts: CreateComponentsOpts): Promise<GossipSubAndComponents> => {
-  const Ctor = opts.pubsub ?? GossipSub
+  const Ctor = opts.pubsub ?? gossipsub
   const privateKey = await generateKeyPair('Ed25519')
   const peerId = peerIdFromPrivateKey(privateKey)
 
@@ -38,7 +39,7 @@ export const createComponents = async (opts: CreateComponentsOpts): Promise<Goss
     peerId,
     registrar: mockRegistrar(),
     connectionManager: stubInterface<ConnectionManager>(),
-    peerStore: new PersistentPeerStore({
+    peerStore: persistentPeerStore({
       peerId,
       datastore: new MemoryDatastore(),
       events,
@@ -49,7 +50,7 @@ export const createComponents = async (opts: CreateComponentsOpts): Promise<Goss
   }
   components.connectionManager = mockConnectionManager(components)
 
-  const pubsub = new Ctor(components, opts.init) as GossipSub
+  const pubsub = Ctor(opts.init)(components) as GossipSub
 
   await start(...Object.entries(components), pubsub)