diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java
index 133adada4..f3424de46 100644
--- a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java
+++ b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java
@@ -10,16 +10,17 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestExtraScalarTypes extends BaseTestCase {
+class TestExtraScalarTypes extends BaseTestCase {
 
   @Test
-  public void test() {
+  void test() {
 
-    Locale locale = Locale.getDefault();
-    Currency currency = Currency.getInstance(locale);
+    Locale locale = Locale.ENGLISH;
+    Currency currency = Currency.getInstance(Locale.US);
     TimeZone tz = TimeZone.getDefault();
 
     ESomeType e = new ESomeType();
@@ -29,20 +30,20 @@ public class TestExtraScalarTypes extends BaseTestCase {
 
     DB.save(e);
 
-    ESomeType e2 = DB.find(ESomeType.class).setAutoTune(false).setId(e.getId()).findOne();
+    ESomeType e2 = DB.find(ESomeType.class).setId(e.getId()).findOne();
 
     assertNotNull(e2.getCurrency());
     assertNotNull(e2.getLocale());
     assertNotNull(e2.getTimeZone());
 
     List<ESomeType> list = DB.find(ESomeType.class)
-      .setAutoTune(false).where()
+      .where()
       .eq("locale", locale)
       .eq("timeZone", tz.getID())
       .eq("currency", currency)
       .findList();
 
-    assertTrue(!list.isEmpty());
+    assertThat(list).isNotEmpty();
   }
 
 }