diff --git a/numba_dpex/tests/_helper.py b/numba_dpex/tests/_helper.py
index c3c6b32ee7..b87b562ee3 100644
--- a/numba_dpex/tests/_helper.py
+++ b/numba_dpex/tests/_helper.py
@@ -10,7 +10,7 @@
 import dpctl
 import pytest
 
-from numba_dpex import config, numba_version
+from numba_dpex import config, numba_sem_version
 
 
 def has_opencl_gpu():
@@ -113,7 +113,7 @@ def is_windows():
 ]
 
 skip_no_numba056 = pytest.mark.skipif(
-    numba_version < (0, 56), reason="Need Numba 0.56 or higher"
+    numba_sem_version < (0, 56), reason="Need Numba 0.56 or higher"
 )
 
 skip_no_gdb = pytest.mark.skipif(
diff --git a/numba_dpex/tests/core/types/USMNdAArray/test_usm_ndarray_creation.py b/numba_dpex/tests/core/types/USMNdArray/test_usm_ndarray_creation.py
similarity index 100%
rename from numba_dpex/tests/core/types/USMNdAArray/test_usm_ndarray_creation.py
rename to numba_dpex/tests/core/types/USMNdArray/test_usm_ndarray_creation.py
diff --git a/numba_dpex/tests/core/types/USMNdAArray/test_usm_ndarray_type.py b/numba_dpex/tests/core/types/USMNdArray/test_usm_ndarray_type.py
similarity index 100%
rename from numba_dpex/tests/core/types/USMNdAArray/test_usm_ndarray_type.py
rename to numba_dpex/tests/core/types/USMNdArray/test_usm_ndarray_type.py
diff --git a/numba_dpex/tests/misc/test_dpctl_version.py b/numba_dpex/tests/misc/test_dpctl_version.py
index d723264de4..b055817c87 100644
--- a/numba_dpex/tests/misc/test_dpctl_version.py
+++ b/numba_dpex/tests/misc/test_dpctl_version.py
@@ -4,12 +4,12 @@
 
 import dpctl
 
-from numba_dpex import dpctl_version
+from numba_dpex import dpctl_sem_version
 
 
 def test_dpctl_version():
     dpctl_v = dpctl.__version__
-    computed_v = ".".join(str(n) for n in dpctl_version)
+    computed_v = ".".join(str(n) for n in dpctl_sem_version)
     n = len(computed_v)
     assert n <= len(dpctl_v)
     assert computed_v == dpctl_v[:n]