diff --git a/ci/build.linux.gitlab-ci.yml b/ci/build.linux.gitlab-ci.yml
index a5916f0eb..fedb90606 100644
--- a/ci/build.linux.gitlab-ci.yml
+++ b/ci/build.linux.gitlab-ci.yml
@@ -314,6 +314,34 @@ build:linux:cross:ppc64le:clang-12:default:
     EIGEN_CI_CXX_COMPILER: clang++-12
     EIGEN_CI_CROSS_INSTALL: g++-10-powerpc64le-linux-gnu clang-12
 
+<<<<<<< HEAD
+=======
+######## loongarch64 #################################################
+
+.build:linux:cross:loongarch64:
+  extends: .build:linux:cross
+  variables:
+    EIGEN_CI_TARGET_ARCH: loongarch64
+    EIGEN_CI_CROSS_TARGET_TRIPLE: loongarch64-linux-gnu
+  tags:
+    - eigen-runner
+    - linux
+    - x86-64
+
+# GCC-14 (minimum on Ubuntu 24)
+build:linux:cross:loongarch64:gcc-14:default:
+  extends: .build:linux:cross:loongarch64
+  image: ubuntu:24.04
+  variables:
+    EIGEN_CI_CROSS_INSTALL: g++-14-loongarch64-linux-gnu
+    EIGEN_CI_CROSS_C_COMPILER: loongarch64-linux-gnu-gcc-14
+    EIGEN_CI_CROSS_CXX_COMPILER: loongarch64-linux-gnu-g++-14
+    EIGEN_CI_ADDITIONAL_ARGS: >-
+      -DCMAKE_SYSTEM_NAME=Linux
+      -DCMAKE_CROSSCOMPILING_EMULATOR=qemu-loongarch64-static;-L;/usr/loongarch64-linux-gnu
+      -DEIGEN_TEST_LSX=on
+
+>>>>>>> 9589cc4e7 (Fix loongarch64 emulated tests.)
 ######## MR Smoke Tests ########################################################
 
 build:linux:cross:x86-64:gcc-10:default:smoketest:
diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake
index a9696abe7..77706e98e 100644
--- a/cmake/EigenTesting.cmake
+++ b/cmake/EigenTesting.cmake
@@ -23,7 +23,7 @@ macro(ei_add_test_internal testname testname_with_suffix)
     set(is_gpu_test ON)
     if(EIGEN_TEST_CUDA_CLANG)
       set_source_files_properties(${filename} PROPERTIES LANGUAGE CXX)
-      if(CUDA_64_BIT_DEVICE_CODE)
+      if(CUDA_64_BIT_DEVICE_CODE AND (EXISTS "${CUDA_TOOLKIT_ROOT_DIR}/lib64"))
         link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")
       else()
         link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib")
@@ -102,7 +102,7 @@ macro(ei_add_test_internal testname testname_with_suffix)
     endif()
   endif()
 
-  add_test(${testname_with_suffix} "${targetname}")
+  add_test(NAME ${testname_with_suffix} COMMAND "${targetname}")
   if (is_gpu_test)
     # Add gpu tag for testing only GPU tests.
     set_property(TEST ${testname_with_suffix} APPEND PROPERTY LABELS "gpu")
@@ -201,7 +201,7 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix)
     endif()
   endif()
 
-  add_test(${testname_with_suffix} "${targetname}")
+  add_test(NAME ${testname_with_suffix} COMMAND "${targetname}")
 
   # Specify target and test labels according to EIGEN_CURRENT_SUBPROJECT
   get_property(current_subproject GLOBAL PROPERTY EIGEN_CURRENT_SUBPROJECT)