diff --git a/catkin_tools/resultspace.py b/catkin_tools/resultspace.py
index 290896c5..0f0ad9c3 100644
--- a/catkin_tools/resultspace.py
+++ b/catkin_tools/resultspace.py
@@ -110,7 +110,8 @@ def get_resultspace_environment(result_space_path, base_env=None, quiet=False, c
 
     # Use fallback shell if using a non-standard shell
     if shell_name not in ['bash', 'zsh']:
-        shell_name = 'bash'
+        shell_path = DEFAULT_SHELL
+        (_, shell_name) = os.path.split(shell_path)
 
     # Check to make sure result_space_path contains the appropriate setup file
     setup_file_path = os.path.join(result_space_path, 'env.sh')