diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh
index 69303013d2a41a049276c0d1b03b9d902b555d23..a05761ea6dc245886f3a159b9decae0f7578fbc0 100755
--- a/paddle/scripts/paddle_build.sh
+++ b/paddle/scripts/paddle_build.sh
@@ -246,6 +246,7 @@ function cmake_base() {
         -DWITH_GRPC=${grpc_flag}
 	    -DWITH_GLOO=${gloo_flag}
         -DWITH_LITE=${WITH_LITE:-OFF}
+        -DWITH_XPU=${WITH_XPU:-OFF}
         -DLITE_GIT_TAG=develop
     ========================================
 EOF
@@ -277,6 +278,7 @@ EOF
         -DWITH_GRPC=${grpc_flag} \
 	    -DWITH_GLOO=${gloo_flag} \
         -DLITE_GIT_TAG=develop \
+        -DWITH_XPU=${WITH_XPU:-OFF} \
         -DWITH_LITE=${WITH_LITE:-OFF};build_error=$?
     if [ "$build_error" != 0 ];then
         exit 7;
@@ -895,7 +897,11 @@ function card_test() {
     case_count $1 $2
     ut_startTime_s=`date +%s` 
     # get the CUDA device count
-    CUDA_DEVICE_COUNT=$(nvidia-smi -L | wc -l)
+    if [ "${WITH_XPU}" == "ON" ];then
+        CUDA_DEVICE_COUNT=4
+    else
+        CUDA_DEVICE_COUNT=$(nvidia-smi -L | wc -l)
+    fi
 
     testcases=$1
     if (( $# > 1 )); then
@@ -1163,6 +1169,41 @@ EOF
     fi
 }
 
+function parallel_test_base_xpu() {
+    mkdir -p ${PADDLE_ROOT}/build
+    cd ${PADDLE_ROOT}/build
+    if [ ${WITH_TESTING:-ON} == "ON" ] ; then
+    cat <<EOF
+    ========================================
+    Running unit cpu tests ...
+    ========================================
+EOF
+
+set +x
+        ut_startTime_s=`date +%s`
+        test_cases=$(ctest -N -V | grep "_xpu" )        # cases list which would be run exclusively
+        while read -r line; do
+            if [[ "$line" == "" ]]; then
+                continue
+            fi
+            read testcase <<< $(echo "$line"|grep -oEi "\w+$")
+            if [[ "$single_card_tests" == "" ]]; then
+                single_card_tests="^$testcase$"
+            else
+                single_card_tests="$single_card_tests|^$testcase$"
+            fi
+        done <<< "$test_cases";
+        card_test "$single_card_tests" 1
+        collect_failed_tests
+set -x
+        ut_endTime_s=`date +%s`
+        echo "XPU testCase Time: $[ $ut_endTime_s - $ut_startTime_s ]s"
+        if [[ "$EXIT_CODE" != "0" ]]; then
+            exit 8;
+        fi
+    fi   
+}
+
 function parallel_test() {
     ut_total_startTime_s=`date +%s`
     mkdir -p ${PADDLE_ROOT}/build
@@ -1171,7 +1212,11 @@ function parallel_test() {
     if [ "$WITH_GPU" == "ON" ];then
         parallel_test_base_gpu
     else
-        parallel_test_base_cpu ${PROC_RUN:-1}
+        if [ "$WITH_XPU" == "ON" ];then
+            parallel_test_base_xpu
+        else
+            parallel_test_base_cpu ${PROC_RUN:-1}
+        fi
     fi
     ut_total_endTime_s=`date +%s`
     echo "TestCases Total Time: $[ $ut_total_endTime_s - $ut_total_startTime_s ]s"
@@ -1500,6 +1545,7 @@ EOF
     fi
 }
 
+
 function build_document_preview() {
     sh /paddle/tools/document_preview.sh ${PORT}
 }
@@ -1666,6 +1712,10 @@ function main() {
         cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number}
         parallel_test
         ;;
+      check_xpu)
+        cmake_gen_and_build ${PYTHON_ABI:-""} ${parallel_number}
+        parallel_test
+        ;;
       cmake_gen)
         cmake_gen ${PYTHON_ABI:-""}
         ;;
diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt
index 0fd1d749be656075e4880e6d9777bc35604d2db5..8f1b963ac8a5f7ee375578207840e9ed2e1907f4 100644
--- a/python/paddle/fluid/tests/unittests/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt
@@ -547,6 +547,10 @@ add_subdirectory(sequence)
 add_subdirectory(dygraph_to_static)
 add_subdirectory(rnn)
 
+if (WITH_XPU)
+    add_subdirectory(xpu)
+endif()
+
 if (WITH_MKLDNN)
     add_subdirectory(mkldnn)
 endif()
diff --git a/python/paddle/fluid/tests/unittests/xpu/CMakeLists.txt b/python/paddle/fluid/tests/unittests/xpu/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f71e04c09aa38b8cf7b3a167b84d4dc0e6cc3ec7
--- /dev/null
+++ b/python/paddle/fluid/tests/unittests/xpu/CMakeLists.txt
@@ -0,0 +1,6 @@
+file(GLOB TEST_OPS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "test_*.py")
+string(REPLACE ".py" "" TEST_OPS "${TEST_OPS}")
+
+foreach(TEST_OP ${TEST_OPS})
+    py_test_modules(${TEST_OP} MODULES ${TEST_OP})
+endforeach(TEST_OP)
diff --git a/python/paddle/fluid/tests/unittests/xpu/test_activation_op.py b/python/paddle/fluid/tests/unittests/xpu/test_activation_op_xpu.py
similarity index 100%
rename from python/paddle/fluid/tests/unittests/xpu/test_activation_op.py
rename to python/paddle/fluid/tests/unittests/xpu/test_activation_op_xpu.py
diff --git a/python/paddle/fluid/tests/unittests/xpu/test_elementwise_add_op.py b/python/paddle/fluid/tests/unittests/xpu/test_elementwise_add_op_xpu.py
similarity index 100%
rename from python/paddle/fluid/tests/unittests/xpu/test_elementwise_add_op.py
rename to python/paddle/fluid/tests/unittests/xpu/test_elementwise_add_op_xpu.py
diff --git a/python/paddle/fluid/tests/unittests/xpu/test_matmul_op.py b/python/paddle/fluid/tests/unittests/xpu/test_matmul_op_xpu.py
similarity index 100%
rename from python/paddle/fluid/tests/unittests/xpu/test_matmul_op.py
rename to python/paddle/fluid/tests/unittests/xpu/test_matmul_op_xpu.py
diff --git a/python/paddle/fluid/tests/unittests/xpu/test_mul_op.py b/python/paddle/fluid/tests/unittests/xpu/test_mul_op_xpu.py
similarity index 100%
rename from python/paddle/fluid/tests/unittests/xpu/test_mul_op.py
rename to python/paddle/fluid/tests/unittests/xpu/test_mul_op_xpu.py