diff --git a/frontends/nextjs/src/components/pagination/ItemsPerPageSelector.test.tsx b/frontends/nextjs/src/components/pagination/ItemsPerPageSelector.test.tsx
index 93ebe4286..6f4ef285c 100644
--- a/frontends/nextjs/src/components/pagination/ItemsPerPageSelector.test.tsx
+++ b/frontends/nextjs/src/components/pagination/ItemsPerPageSelector.test.tsx
@@ -35,6 +35,7 @@ describe('ItemsPerPageSelector', () => {
 
     const select = container.querySelector('select')
     expect(select !== null).toBe(true)
+    if (select) {
       // Create a proper change event with a select element
       Object.defineProperty(select, 'value', {
         writable: true,
diff --git a/frontends/nextjs/src/lib/api/retry.test.ts b/frontends/nextjs/src/lib/api/retry.test.ts
index 58320fcb8..d19626b2d 100644
--- a/frontends/nextjs/src/lib/api/retry.test.ts
+++ b/frontends/nextjs/src/lib/api/retry.test.ts
@@ -145,7 +145,8 @@ describe('retry utilities', () => {
   describe('retry', () => {
     it('should retry async function on failure', async () => {
       let callCount = 0
-      const mockFn = vi.fn(async () => // eslint-disable-line @typescript-eslint/require-await { // eslint-disable-line @typescript-eslint/require-await
+      // eslint-disable-next-line @typescript-eslint/require-await
+      const mockFn = vi.fn(async () => {
         callCount++
         if (callCount < 2) {
           throw new Error('Temporary error')
@@ -164,7 +165,8 @@ describe('retry utilities', () => {
     })
 
     it('should return result on first success', async () => {
-      const mockFn = vi.fn(async () => // eslint-disable-line @typescript-eslint/require-await 'success')
+      // eslint-disable-next-line @typescript-eslint/require-await
+      const mockFn = vi.fn(async () => 'success')
 
       const result = await retry(mockFn, { maxRetries: 3, initialDelayMs: 10 })
       
@@ -173,7 +175,8 @@ describe('retry utilities', () => {
     })
 
     it('should throw after max retries', async () => {
-      const mockFn = vi.fn(async () => // eslint-disable-line @typescript-eslint/require-await { // eslint-disable-line @typescript-eslint/require-await
+      // eslint-disable-next-line @typescript-eslint/require-await
+      const mockFn = vi.fn(async () => {
         throw new Error('Persistent error')
       })
 
@@ -187,7 +190,8 @@ describe('retry utilities', () => {
 
     it('should use exponential backoff', async () => {
       let callCount = 0
-      const mockFn = vi.fn(async () => // eslint-disable-line @typescript-eslint/require-await { // eslint-disable-line @typescript-eslint/require-await
+      // eslint-disable-next-line @typescript-eslint/require-await
+      const mockFn = vi.fn(async () => {
         callCount++
         if (callCount < 4) {
           throw new Error('Temporary error')