diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1cb496b..dc38130 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -168,11 +168,11 @@ jobs:
         run: |
           export KUBECONFIG=$HOME/.kube/config_packet
           if [[ "${{ matrix.config.CNI }}" == "calico-vpp" ]]; then
-            go test -count 1 -timeout 1h50m -race -v ./tests_${{ matrix.config.CNI }} -parallel 4 || true
+            go test -count 1 -timeout 1h50m -race -v ./test/${{ matrix.config.CNI }} -parallel 4 || true
           elif [ "${SRIOV_ENABLED}" == true ]; then
-            go test -count 1 -timeout 1h50m -race -v ./tests_${{ matrix.config.CNI }} -parallel 4
+            go test -count 1 -timeout 1h50m -race -v ./test/${{ matrix.config.CNI }} -parallel 4
           else
-            go test -count 1 -timeout 1h50m -race -v ./tests_${{ matrix.config.CNI }}/main_test.go -parallel 4
+            go test -count 1 -timeout 1h50m -race -v ./test/${{ matrix.config.CNI }}/main_test.go -parallel 4
           fi
         env:
           ARTIFACTS_DIR: logs
@@ -183,7 +183,7 @@ jobs:
         if: ${{ always() }}
         with:
           name: ${{ matrix.config.node_type }}-${{ matrix.config.CNI }}-logs
-          path: ${{ github.repository }}/tests_${{ matrix.config.node_type }}_${{ matrix.config.CNI }}/logs
+          path: ${{ github.repository }}/test/${{ matrix.config.CNI }}/logs
 
       - name: Cleanup
         if: ${{ always() }}
diff --git a/tests_calico-vpp/main_test.go b/test/calico-vpp/main_test.go
similarity index 96%
rename from tests_calico-vpp/main_test.go
rename to test/calico-vpp/main_test.go
index 93371ac..4606493 100644
--- a/tests_calico-vpp/main_test.go
+++ b/test/calico-vpp/main_test.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2020-2022 Doc.ai and/or its affiliates.
 //
-// Copyright (c) 2023 Cisco and/or its affiliates.
+// Copyright (c) 2023-2024 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -16,7 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main_test
+package calico_vpp_test
 
 import (
 	"testing"
diff --git a/tests_default/feature_test.go b/test/default/feature_test.go
similarity index 97%
rename from tests_default/feature_test.go
rename to test/default/feature_test.go
index f4cb5ee..1b3bda9 100644
--- a/tests_default/feature_test.go
+++ b/test/default/feature_test.go
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main_test
+package default_test
 
 import (
 	"testing"
diff --git a/tests_default/heal_test.go b/test/default/heal_test.go
similarity index 97%
rename from tests_default/heal_test.go
rename to test/default/heal_test.go
index af2eaa6..dde40bf 100644
--- a/tests_default/heal_test.go
+++ b/test/default/heal_test.go
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main_test
+package default_test
 
 import (
 	"testing"
diff --git a/tests_default/main_test.go b/test/default/main_test.go
similarity index 98%
rename from tests_default/main_test.go
rename to test/default/main_test.go
index 3d34de8..c9d22d5 100644
--- a/tests_default/main_test.go
+++ b/test/default/main_test.go
@@ -16,7 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main_test
+package default_test
 
 import (
 	"testing"
diff --git a/tests_default/observ_test.go b/test/default/observ_test.go
similarity index 97%
rename from tests_default/observ_test.go
rename to test/default/observ_test.go
index ec94386..3f00784 100644
--- a/tests_default/observ_test.go
+++ b/test/default/observ_test.go
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main_test
+package default_test
 
 import (
 	"testing"
diff --git a/tests_default/sriov_test.go b/test/default/sriov_test.go
similarity index 98%
rename from tests_default/sriov_test.go
rename to test/default/sriov_test.go
index 72c345c..387902c 100644
--- a/tests_default/sriov_test.go
+++ b/test/default/sriov_test.go
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main_test
+package default_test
 
 import (
 	"testing"