diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index b3ade4ca8eaf8..4959197fcd994 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -68,7 +68,9 @@ jobs:
           - image: conda-cpp
             title: AMD64 Conda C++
           - image: ubuntu-cpp-sanitizer
-            title: AMD64 Ubuntu 20.04 C++ ASAN UBSAN
+            title: AMD64 Ubuntu 22.04 C++ ASAN UBSAN
+    env:
+      UBUNTU: "22.04"
     steps:
       - name: Checkout Arrow
         uses: actions/checkout@v3
diff --git a/cpp/src/arrow/flight/CMakeLists.txt b/cpp/src/arrow/flight/CMakeLists.txt
index 950f7d78a9375..a97047e7d4ed4 100644
--- a/cpp/src/arrow/flight/CMakeLists.txt
+++ b/cpp/src/arrow/flight/CMakeLists.txt
@@ -280,7 +280,7 @@ if(ARROW_TESTING)
     set(ARROW_FLIGHT_TESTING_STATIC_INSTALL_INTERFACE_LIBS
         ArrowFlight::arrow_flight_static)
   endif()
-  if(ARROW_TEST_LINKAGE STREQUAL "shared")
+  if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "shared")
     list(APPEND ARROW_FLIGHT_TESTING_SHARED_LINK_LIBS arrow_testing_shared)
     list(APPEND ARROW_FLIGHT_TESTING_STATIC_LINK_LIBS arrow_testing_shared)
     list(APPEND ARROW_FLIGHT_TESTING_SHARED_INSTALL_INTERFACE_LIBS