diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index dbafc4d4e2..be64f04783 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -4,6 +4,12 @@ export { DefaultUserAgent } from "./lib/waku.js";
 export * as proto_message from "./proto/message.js";
 export * as proto_topic_only_message from "./proto/topic_only_message.js";
 
+export {
+  createEncoder,
+  createDecoder,
+  DecodedMessage,
+} from "./lib/waku_message/version_0.js";
+
 export * as waku from "./lib/waku.js";
 export { WakuNode } from "./lib/waku.js";
 
diff --git a/packages/tests/tests/ephemeral.node.spec.ts b/packages/tests/tests/ephemeral.node.spec.ts
index 48d933058b..a20e9421a5 100644
--- a/packages/tests/tests/ephemeral.node.spec.ts
+++ b/packages/tests/tests/ephemeral.node.spec.ts
@@ -1,10 +1,6 @@
 import { bytesToUtf8, utf8ToBytes } from "@waku/byte-utils";
+import { createDecoder, createEncoder, DecodedMessage } from "@waku/core";
 import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer";
-import {
-  createDecoder,
-  createEncoder,
-  DecodedMessage,
-} from "@waku/core/lib/waku_message/version_0";
 import { createLightNode } from "@waku/create";
 import { Protocols, WakuLight } from "@waku/interfaces";
 import {
diff --git a/packages/tests/tests/filter.node.spec.ts b/packages/tests/tests/filter.node.spec.ts
index f4d8fd5915..f1d456c906 100644
--- a/packages/tests/tests/filter.node.spec.ts
+++ b/packages/tests/tests/filter.node.spec.ts
@@ -1,9 +1,6 @@
 import { bytesToUtf8, utf8ToBytes } from "@waku/byte-utils";
+import { createDecoder, createEncoder } from "@waku/core";
 import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer";
-import {
-  createDecoder,
-  createEncoder,
-} from "@waku/core/lib/waku_message/version_0";
 import { createLightNode } from "@waku/create";
 import type { DecodedMessage, WakuLight } from "@waku/interfaces";
 import { Protocols } from "@waku/interfaces";
diff --git a/packages/tests/tests/light_push.node.spec.ts b/packages/tests/tests/light_push.node.spec.ts
index fc23be430f..d61f2cb63f 100644
--- a/packages/tests/tests/light_push.node.spec.ts
+++ b/packages/tests/tests/light_push.node.spec.ts
@@ -1,6 +1,6 @@
 import { bytesToUtf8, utf8ToBytes } from "@waku/byte-utils";
+import { createEncoder } from "@waku/core";
 import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer";
-import { createEncoder } from "@waku/core/lib/waku_message/version_0";
 import { createLightNode } from "@waku/create";
 import type { WakuLight } from "@waku/interfaces";
 import { Protocols } from "@waku/interfaces";
diff --git a/packages/tests/tests/relay.node.spec.ts b/packages/tests/tests/relay.node.spec.ts
index 39f86fede3..d22c4588f8 100644
--- a/packages/tests/tests/relay.node.spec.ts
+++ b/packages/tests/tests/relay.node.spec.ts
@@ -1,12 +1,8 @@
 import { PeerId } from "@libp2p/interface-peer-id";
 import { bytesToUtf8, utf8ToBytes } from "@waku/byte-utils";
 import { DefaultPubSubTopic } from "@waku/core";
+import { createDecoder, createEncoder, DecodedMessage } from "@waku/core";
 import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer";
-import {
-  createDecoder,
-  createEncoder,
-  DecodedMessage,
-} from "@waku/core/lib/waku_message/version_0";
 import { createPrivacyNode } from "@waku/create";
 import type { WakuPrivacy } from "@waku/interfaces";
 import { Protocols } from "@waku/interfaces";
diff --git a/packages/tests/tests/store.node.spec.ts b/packages/tests/tests/store.node.spec.ts
index 9cb7496950..f1743169f6 100644
--- a/packages/tests/tests/store.node.spec.ts
+++ b/packages/tests/tests/store.node.spec.ts
@@ -1,10 +1,7 @@
 import { bytesToUtf8, utf8ToBytes } from "@waku/byte-utils";
 import { createCursor, PageDirection } from "@waku/core";
+import { createDecoder, createEncoder } from "@waku/core";
 import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer";
-import {
-  createDecoder,
-  createEncoder,
-} from "@waku/core/lib/waku_message/version_0";
 import { createLightNode } from "@waku/create";
 import { DecodedMessage, Message, WakuLight } from "@waku/interfaces";
 import { Protocols } from "@waku/interfaces";