diff --git a/packages/java/tests/spring/react-signals/frontend/helper/NumberSignalServiceWrapper.ts b/packages/java/tests/spring/react-signals/frontend/helper/NumberSignalServiceWrapper.ts
deleted file mode 100644
index 04d5d832a4..0000000000
--- a/packages/java/tests/spring/react-signals/frontend/helper/NumberSignalServiceWrapper.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NumberSignalChannel } from '@vaadin/hilla-react-signals';
-import client_1 from 'Frontend/generated/connect-client.default.js';
-
-export function sharedValue() {
-  const signalChannel = new NumberSignalChannel('NumberSignalProviderService.sharedValue', client_1);
-  return signalChannel.signal;
-}
-
-export function counter() {
-  const signalChannel = new NumberSignalChannel('NumberSignalProviderService.counter', client_1);
-  return signalChannel.signal;
-}
diff --git a/packages/java/tests/spring/react-signals/frontend/views/SharedNumberSignal.tsx b/packages/java/tests/spring/react-signals/frontend/views/SharedNumberSignal.tsx
index 68f1fe8f32..5ba4254d06 100644
--- a/packages/java/tests/spring/react-signals/frontend/views/SharedNumberSignal.tsx
+++ b/packages/java/tests/spring/react-signals/frontend/views/SharedNumberSignal.tsx
@@ -1,10 +1,9 @@
-import * as NumberSignalServiceWrapper from '../helper/NumberSignalServiceWrapper.js';
 import { Button } from '@vaadin/react-components';
 import { useSignal } from '@vaadin/hilla-react-signals';
 import { NumberSignalProviderService } from 'Frontend/generated/endpoints.js';
 
-const counter = NumberSignalServiceWrapper.counter();
-const sharedValue = NumberSignalServiceWrapper.sharedValue();
+const counter = NumberSignalProviderService.counter();
+const sharedValue = NumberSignalProviderService.sharedValue();
 
 export default function SharedNumberSignal() {
   const sharedValueFromServer = useSignal<number | undefined>(0.0);
diff --git a/packages/java/tests/spring/react-signals/src/main/java/com/vaadin/hilla/test/signals/service/package-info.java b/packages/java/tests/spring/react-signals/src/main/java/com/vaadin/hilla/test/signals/service/package-info.java
new file mode 100644
index 0000000000..088a64e169
--- /dev/null
+++ b/packages/java/tests/spring/react-signals/src/main/java/com/vaadin/hilla/test/signals/service/package-info.java
@@ -0,0 +1,3 @@
+@org.springframework.lang.NonNullApi
+
+package com.vaadin.hilla.test.signals.service;