diff --git a/src/test/java/org/springframework/data/aerospike/convert/MappingAerospikeConverterTests.java b/src/test/java/org/springframework/data/aerospike/convert/MappingAerospikeConverterTests.java
index a1b4bee58..f38cc630a 100644
--- a/src/test/java/org/springframework/data/aerospike/convert/MappingAerospikeConverterTests.java
+++ b/src/test/java/org/springframework/data/aerospike/convert/MappingAerospikeConverterTests.java
@@ -376,7 +376,7 @@ public void shouldReadExpirationForDocumentWithPersistenceConstructor(int conver
 
         DocumentWithExpirationAnnotationAndPersistenceConstructor document =
             aerospikeConverter.read(DocumentWithExpirationAnnotationAndPersistenceConstructor.class, forRead);
-        assertThat(document.getExpiration()).isCloseTo(TimeUnit.MINUTES.toSeconds(1), Offset.offset(100L));
+        assertThat(document.getExpiration()).isCloseTo((int) TimeUnit.MINUTES.toSeconds(1), Offset.offset(100));
     }
 
     @ParameterizedTest()
diff --git a/src/test/java/org/springframework/data/aerospike/core/AerospikeExpirationTests.java b/src/test/java/org/springframework/data/aerospike/core/AerospikeExpirationTests.java
index f53122b86..5cbfd5a3b 100644
--- a/src/test/java/org/springframework/data/aerospike/core/AerospikeExpirationTests.java
+++ b/src/test/java/org/springframework/data/aerospike/core/AerospikeExpirationTests.java
@@ -153,12 +153,12 @@ public void shouldExpire() {
 
     @Test
     public void shouldSaveAndGetDocumentWithImmutableExpiration() {
-        template.insert(new DocumentWithExpirationAnnotationAndPersistenceConstructor(id, 60L));
+        template.insert(new DocumentWithExpirationAnnotationAndPersistenceConstructor(id, 60));
 
         DocumentWithExpirationAnnotationAndPersistenceConstructor doc = template.findById(id,
             DocumentWithExpirationAnnotationAndPersistenceConstructor.class);
         assertThat(doc).isNotNull();
-        assertThat(doc.getExpiration()).isCloseTo(60L, Offset.offset(10L));
+        assertThat(doc.getExpiration()).isCloseTo(60, Offset.offset(10));
     }
 
     @Test