diff --git a/run_tests_no_ot.sh b/run_tests_no_ot.sh
index df1c175..4720101 100755
--- a/run_tests_no_ot.sh
+++ b/run_tests_no_ot.sh
@@ -5,17 +5,26 @@
 set -e
 
 echo "Running tests without OpenTelemetry (default mode)..."
+echo "====================================================="
 
 # Ensure OpenTelemetry is disabled
 export ENABLE_OPENTELEMETRY=false
 export OTEL_ENABLED=false
-export DJANGO_SETTINGS_MODULE=ivatar.settings
 
-# Run tests excluding OpenTelemetry-specific tests
-python3 -m pytest \
-    -m "not opentelemetry" \
-    --verbose \
-    --tb=short \
-    "$@"
+# Run Django tests excluding OpenTelemetry-specific tests
+python3 manage.py test \
+    ivatar.ivataraccount.test_auth \
+    ivatar.ivataraccount.test_views \
+    ivatar.ivataraccount.test_views_bluesky \
+    ivatar.test_auxiliary \
+    ivatar.test_file_security \
+    ivatar.test_static_pages \
+    ivatar.test_utils \
+    ivatar.test_views \
+    ivatar.test_views_stats \
+    ivatar.tools.test_views \
+    ivatar.test_wsgi \
+    -v2
 
+echo ""
 echo "Tests completed successfully (OpenTelemetry disabled)"
diff --git a/run_tests_with_ot.sh b/run_tests_with_ot.sh
index b97ef48..63de521 100755
--- a/run_tests_with_ot.sh
+++ b/run_tests_with_ot.sh
@@ -5,19 +5,29 @@
 set -e
 
 echo "Running tests with OpenTelemetry enabled..."
+echo "=========================================="
 
 # Enable OpenTelemetry
 export ENABLE_OPENTELEMETRY=true
 export OTEL_ENABLED=true
 export OTEL_SERVICE_NAME=ivatar-test
 export OTEL_ENVIRONMENT=test
-export DJANGO_SETTINGS_MODULE=ivatar.settings
 
-# Run tests including OpenTelemetry-specific tests
-python3 -m pytest \
-    -m "opentelemetry or no_opentelemetry" \
-    --verbose \
-    --tb=short \
-    "$@"
+# Run Django tests including OpenTelemetry-specific tests
+python3 manage.py test \
+    ivatar.ivataraccount.test_auth \
+    ivatar.ivataraccount.test_views \
+    ivatar.ivataraccount.test_views_bluesky \
+    ivatar.test_auxiliary \
+    ivatar.test_file_security \
+    ivatar.test_opentelemetry \
+    ivatar.test_static_pages \
+    ivatar.test_utils \
+    ivatar.test_views \
+    ivatar.test_views_stats \
+    ivatar.tools.test_views \
+    ivatar.test_wsgi \
+    -v2
 
+echo ""
 echo "Tests completed successfully (OpenTelemetry enabled)"