diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 784d2c77d..3524ca738 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
           - labels: [self-hosted, Linux, X64, cpu]
             container: "ubuntu"
           - labels: [self-hosted, Linux, X64, ipex-a380-6gb]
-            container: "intel/intel-optimized-pytorch:2.3.0-pip-base"
+            container: "intel/intel-optimized-pytorch:2.1.20-xpu-pip-base"
           - labels: [self-hosted, Linux, X64, rocm-7600-8gb]
             container: "rocm/pytorch:rocm6.0.2_ubuntu22.04_py3.10_pytorch_2.1.2"
           - labels: [self-hosted, Linux, X64, cuda-3060-12gb]
diff --git a/tests/conftest.py b/tests/conftest.py
index 9972e77aa..6727711a9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -54,7 +54,6 @@ def has_gpu() -> bool:
     try:
         import intel_extension_for_pytorch as ipex
         has_gpu = ipex.xpu.device_count() > 0
-        return has_gpu
     except ImportError:
         try:
             import torch