diff --git a/tribits/core/package_arch/TribitsAddTest.cmake b/tribits/core/package_arch/TribitsAddTest.cmake
index 6f388fdac..6578e8d3a 100644
--- a/tribits/core/package_arch/TribitsAddTest.cmake
+++ b/tribits/core/package_arch/TribitsAddTest.cmake
@@ -817,6 +817,8 @@ function(tribits_add_test EXE_NAME)
     message("TRIBITS_ADD_TEST: ${EXE_NAME} ${ARGN}")
   endif()
 
+  tribits_set_tribits_package_name()
+
   global_set(TRIBITS_ADD_TEST_ADD_TEST_INPUT)
   global_set(TRIBITS_SET_TEST_PROPERTIES_INPUT)
   global_set(MESSAGE_WRAPPER_INPUT)
@@ -935,8 +937,6 @@ function(tribits_add_test EXE_NAME)
   tribits_add_test_adjust_directory( ${EXE_BINARY_NAME} "${PARSE_DIRECTORY}"
     EXECUTABLE_PATH)
 
-  #message("TRIBITS_ADD_TEST: ${EXE_NAME}: EXECUTABLE_PATH = ${EXECUTABLE_PATH}")
-
   #
   # D) Determine if we will add the serial or MPI tests based on input COMM
   # and TPL_ENABLE_MPI
diff --git a/tribits/core/package_arch/TribitsAddTestHelpers.cmake b/tribits/core/package_arch/TribitsAddTestHelpers.cmake
index 715bca20f..9815e538b 100644
--- a/tribits/core/package_arch/TribitsAddTestHelpers.cmake
+++ b/tribits/core/package_arch/TribitsAddTestHelpers.cmake
@@ -39,6 +39,7 @@
 
 
 include(TribitsAddExecutableTestHelpers)
+include(TribitsSetTribitsPackageName)
 include(TribitsGeneralMacros)
 include(TribitsTestCategories)
 
diff --git a/tribits/core/package_arch/TribitsSetTribitsPackageName.cmake b/tribits/core/package_arch/TribitsSetTribitsPackageName.cmake
new file mode 100644
index 000000000..40bae1fc6
--- /dev/null
+++ b/tribits/core/package_arch/TribitsSetTribitsPackageName.cmake
@@ -0,0 +1,52 @@
+# @HEADER
+# ************************************************************************
+#
+#            TriBITS: Tribal Build, Integrate, and Test System
+#                    Copyright 2013 Sandia Corporation
+#
+# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+# the U.S. Government retains certain rights in this software.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the Corporation nor the names of the
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# ************************************************************************
+# @HEADER
+
+
+# Set the TriBITS package name var if it has not already been set
+#
+macro(tribits_set_tribits_package_name)
+  if (PACKAGE_NAME STREQUAL "")
+    if (NOT PROJECT_NAME STREQUAL "")
+      set(PACKAGE_NAME ${PROJECT_NAME})
+    else()
+       message(SEND_ERROR "Error! Can't set default PACKAGE_NAME because"
+	 " PROJECT_NAME is not set!")
+    endif()
+  endif()
+endmacro()
diff --git a/tribits/examples/TribitsExampleProject2/packages/package1/test/CMakeLists.tribits.cmake b/tribits/examples/TribitsExampleProject2/packages/package1/test/CMakeLists.tribits.cmake
index 308757908..bc79820e3 100644
--- a/tribits/examples/TribitsExampleProject2/packages/package1/test/CMakeLists.tribits.cmake
+++ b/tribits/examples/TribitsExampleProject2/packages/package1/test/CMakeLists.tribits.cmake
@@ -1,3 +1,3 @@
 tribits_add_test(package1-prg  NOEXEPREFIX  NOEXESUFFIX
-  NAME Prg  DIRECTORY ${PACKAGE_BINARY_DIR}/src  NUM_MPI_PROCS 1
+  NAME Prg  DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../src"  NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "Package1 Deps: tpl1" )