diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 5d08764..5293844 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -32,9 +32,13 @@ jobs:
 
       - name: Build
         run: go build ./cmd/oms
-  
-      - name: Test
+
+      - name: Unit Tests
         run: go test ./...
 
+      - name: Integration Tests
+        if: matrix.os == 'ubuntu-latest'
+        run: go test -tags=integration ./...
+
       - name: Coverage
         run: make unit-test-coverage functional-test-coverage coverage-report
diff --git a/app/shipment/api_test.go b/app/shipment/api_test.go
index 2c8fdaa..2b29981 100644
--- a/app/shipment/api_test.go
+++ b/app/shipment/api_test.go
@@ -1,3 +1,5 @@
+//go:build integration
+
 package shipment_test
 
 import (
diff --git a/app/test/order_test.go b/app/test/order_test.go
index b680a4f..c0bddde 100644
--- a/app/test/order_test.go
+++ b/app/test/order_test.go
@@ -1,3 +1,5 @@
+//go:build integration
+
 package test
 
 import (