diff --git a/pom.xml b/pom.xml
index ca6f7eaf0..112215bd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -308,9 +308,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.avaje.moduuid</groupId>
-      <artifactId>avaje-moduuid</artifactId>
-      <version>2.1</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>mod-uuid</artifactId>
+      <version>1.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/test/java/org/tests/example/ModUuidGenerator.java b/src/test/java/org/tests/example/ModUuidGenerator.java
index e97cc5096..76cb7d62c 100644
--- a/src/test/java/org/tests/example/ModUuidGenerator.java
+++ b/src/test/java/org/tests/example/ModUuidGenerator.java
@@ -1,7 +1,7 @@
 package org.tests.example;
 
+import io.avaje.moduuid.ModUUID;
 import io.ebean.config.IdGenerator;
-import org.avaje.moduuid.ModUUID;
 
 /**
  * A customer Id Generator that can be assigned by @GeneratedValue(generator="shortUid")
diff --git a/src/test/java/org/tests/idkeys/TestCustomId.java b/src/test/java/org/tests/idkeys/TestCustomId.java
index 2be6d1940..6f94dbd53 100644
--- a/src/test/java/org/tests/idkeys/TestCustomId.java
+++ b/src/test/java/org/tests/idkeys/TestCustomId.java
@@ -1,10 +1,10 @@
 package org.tests.idkeys;
 
+import io.avaje.moduuid.ModUUID;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.basic.ECustomId;
-import org.avaje.moduuid.ModUUID;
 import org.junit.Test;
+import org.tests.model.basic.ECustomId;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/tests/iud/TestPersistCascade.java b/src/test/java/org/tests/iud/TestPersistCascade.java
index e82c959e7..63bf765df 100644
--- a/src/test/java/org/tests/iud/TestPersistCascade.java
+++ b/src/test/java/org/tests/iud/TestPersistCascade.java
@@ -1,7 +1,7 @@
 package org.tests.iud;
 
+import io.avaje.moduuid.ModUUID;
 import io.ebean.BaseTestCase;
-import org.avaje.moduuid.ModUUID;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;