Index: contrib/atf/atf-sh/atf-check.cpp
===================================================================
--- contrib/atf/atf-sh/atf-check.cpp
+++ contrib/atf/atf-sh/atf-check.cpp
@@ -348,7 +348,10 @@
     const std::string cmd = flatten_argv(argv);
 
     const char* sh_argv[4];
-    sh_argv[0] = atf::env::get("ATF_SHELL", ATF_SHELL).c_str();
+    if (atf::env::has("ATF_SHELL"))
+        sh_argv[0] = strdup(atf::env::get("ATF_SHELL").c_str());
+    else
+        sh_argv[0] = ATF_SHELL;
     sh_argv[1] = "-c";
     sh_argv[2] = cmd.c_str();
     sh_argv[3] = NULL;