8 files changed, 29 insertions, 27 deletions
diff --git a/test/unit/api/java/CMakeLists.txt b/test/unit/api/java/CMakeLists.txt
index 66b764ca4..61ae74fd2 100644
--- a/test/unit/api/java/CMakeLists.txt
+++ b/test/unit/api/java/CMakeLists.txt
@@ -21,13 +21,13 @@ get_target_property(CVC5_JAR_PATH cvc5jar JAR_FILE)
 
 # specify source files for junit tests
 set(java_test_src_files
-  ${CMAKE_CURRENT_SOURCE_DIR}/cvc5/DatatypeTest.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/cvc5/GrammarTest.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/cvc5/OpTest.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/cvc5/ResultTest.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/cvc5/SolverTest.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/cvc5/SortTest.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/cvc5/TermTest.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/DatatypeTest.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/GrammarTest.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/OpTest.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/ResultTest.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/SolverTest.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/SortTest.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/TermTest.java
 )
 
 # build junit tests
@@ -59,7 +59,7 @@ add_custom_target(
     -Djava.library.path=${CVC5_JNI_PATH}
     -jar ${JUnit_JAR}
     -cp ${JUnit_JAR}:${CVC5_JAR_PATH}:.
-    -select-package cvc5
+    -select-package tests
   COMMENT "Run junit tests"
   VERBATIM
 )
diff --git a/test/unit/api/java/cvc5/DatatypeTest.java b/test/unit/api/java/DatatypeTest.java
index 2f57b6a1c..cd9d7ee73 100644
--- a/test/unit/api/java/cvc5/DatatypeTest.java
+++ b/test/unit/api/java/DatatypeTest.java
@@ -13,11 +13,11 @@
  * Black box testing of the datatype classes of the Java API.
  */
 
-package cvc5;
-
-import static cvc5.Kind.*;
+package tests;
+import static io.github.cvc5.api.Kind.*;
 import static org.junit.jupiter.api.Assertions.*;
 
+import io.github.cvc5.api.*;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import org.junit.jupiter.api.AfterEach;
diff --git a/test/unit/api/java/cvc5/GrammarTest.java b/test/unit/api/java/GrammarTest.java
index 6e7c6ce5e..e9b0d730c 100644
--- a/test/unit/api/java/cvc5/GrammarTest.java
+++ b/test/unit/api/java/GrammarTest.java
@@ -13,11 +13,11 @@
  * Black box testing of the guards of the Java API functions.
  */
 
-package cvc5;
-
-import static cvc5.Kind.*;
+package tests;
+import static io.github.cvc5.api.Kind.*;
 import static org.junit.jupiter.api.Assertions.*;
 
+import io.github.cvc5.api.*;
 import java.util.Arrays;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/test/unit/api/java/cvc5/OpTest.java b/test/unit/api/java/OpTest.java
index f4dd181f4..c63157155 100644
--- a/test/unit/api/java/cvc5/OpTest.java
+++ b/test/unit/api/java/OpTest.java
@@ -13,11 +13,11 @@
  * Black box testing of the Op class.
  */
 
-package cvc5;
-
-import static cvc5.Kind.*;
+package tests;
+import static io.github.cvc5.api.Kind.*;
 import static org.junit.jupiter.api.Assertions.*;
 
+import io.github.cvc5.api.*;
 import java.util.Arrays;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/test/unit/api/java/cvc5/ResultTest.java b/test/unit/api/java/ResultTest.java
index 8ba50c00a..38e981888 100644
--- a/test/unit/api/java/cvc5/ResultTest.java
+++ b/test/unit/api/java/ResultTest.java
@@ -13,10 +13,11 @@
  * Black box testing of the Result class
  */
 
-package cvc5;
+package tests;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import io.github.cvc5.api.*;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/test/unit/api/java/cvc5/SolverTest.java b/test/unit/api/java/SolverTest.java
index 971be58cc..8511827a8 100644
--- a/test/unit/api/java/cvc5/SolverTest.java
+++ b/test/unit/api/java/SolverTest.java
@@ -13,12 +13,13 @@
  * Black box testing of the Solver class of the Java API.
  */
 
-package cvc5;
+package tests;
 
-import static cvc5.Kind.*;
-import static cvc5.RoundingMode.*;
+import static io.github.cvc5.api.Kind.*;
+import static io.github.cvc5.api.RoundingMode.*;
 import static org.junit.jupiter.api.Assertions.*;
 
+import io.github.cvc5.api.*;
 import java.math.BigInteger;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/test/unit/api/java/cvc5/SortTest.java b/test/unit/api/java/SortTest.java
index 1ea703268..6649e5de0 100644
--- a/test/unit/api/java/cvc5/SortTest.java
+++ b/test/unit/api/java/SortTest.java
@@ -13,11 +13,11 @@
  * Black box testing of the guards of the Java API functions.
  */
 
-package cvc5;
-
-import static cvc5.Kind.*;
+package tests;
+import static io.github.cvc5.api.Kind.*;
 import static org.junit.jupiter.api.Assertions.*;
 
+import io.github.cvc5.api.*;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/test/unit/api/java/cvc5/TermTest.java b/test/unit/api/java/TermTest.java
index 98f668006..cb59849e0 100644
--- a/test/unit/api/java/cvc5/TermTest.java
+++ b/test/unit/api/java/TermTest.java
@@ -13,11 +13,11 @@
  * Black box testing of the Term class.
  */
 
-package cvc5;
-
-import static cvc5.Kind.*;
+package tests;
+import static io.github.cvc5.api.Kind.*;
 import static org.junit.jupiter.api.Assertions.*;
 
+import io.github.cvc5.api.*;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;