diff --git a/api/tests/CMakeLists.txt b/api/tests/CMakeLists.txt
index d88cb698..d7af8c89 100644
--- a/api/tests/CMakeLists.txt
+++ b/api/tests/CMakeLists.txt
@@ -20,8 +20,8 @@ add_executable(gmsa_test_client "gmsa_test_client.cpp")
 target_link_libraries(gmsa_test_client
             cf_gmsa_service_private ${_PROTOBUF_LIBPROTOBUF})
 
-add_executable(gmsa_integration_test "gmsa_integration_test.cpp")
-target_link_libraries(gmsa_integration_test
+add_executable(gmsa_api_integration_test "gmsa_api_integration_test.cpp")
+target_link_libraries(gmsa_api_integration_test
             cf_gmsa_service_private
             ${_PROTOBUF_LIBPROTOBUF}
             jsoncpp
@@ -34,6 +34,6 @@ check_pie_supported()
 if (CMAKE_C_LINK_PIE_SUPPORTED)
     set_property(TARGET gmsa_test_client
                 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
-    set_property(TARGET gmsa_integration_test
+    set_property(TARGET gmsa_api_integration_test
                 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
 endif ()
diff --git a/api/tests/gmsa_api_integration_test.cpp b/api/tests/gmsa_api_integration_test.cpp
index 77971883..574a3f7f 100644
--- a/api/tests/gmsa_api_integration_test.cpp
+++ b/api/tests/gmsa_api_integration_test.cpp
@@ -175,7 +175,7 @@ TEST_F( GmsaIntegrationTest, A_AddKerberosArnLeaseMethod_Test )
     // Prepare request
     credentialsfetcher::KerberosArnLeaseRequest request;
 
-    std::string arn = get_environment_var( "CREDSPEC_ARN" );
+    std::string arn = get_environment_var( CF_TEST_CREDSPEC_ARN );
     arn += "#123/WebApp01";
     request.add_credspec_arns( arn );
     request.set_access_key_id( get_environment_var( AWS_ACCESS_KEY_ID ) );