diff --git a/AUTOTEST/check-headers.filters b/AUTOTEST/check-headers.filters
index 580e2dff6..ded74f6e8 100644
--- a/AUTOTEST/check-headers.filters
+++ b/AUTOTEST/check-headers.filters
@@ -4,3 +4,4 @@ include/fortran_matrix.h
 include/multivector.h
 include/interpreter.h
 include/temp_multivector.h
+fatal: No names found, cannot describe anything.
diff --git a/AUTOTEST/cmake.filters b/AUTOTEST/cmake.filters
new file mode 100644
index 000000000..5670f7932
--- /dev/null
+++ b/AUTOTEST/cmake.filters
@@ -0,0 +1 @@
+fatal: No names found, cannot describe anything.
diff --git a/AUTOTEST/configure.filters b/AUTOTEST/configure.filters
index e69de29bb..5670f7932 100644
--- a/AUTOTEST/configure.filters
+++ b/AUTOTEST/configure.filters
@@ -0,0 +1 @@
+fatal: No names found, cannot describe anything.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e6af8bea..7887360b9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,12 +41,16 @@ if (EXISTS ${HYPRE_SOURCE_DIR}/../.git)
   execute_process(COMMAND git -C ${HYPRE_SOURCE_DIR} rev-parse --abbrev-ref HEAD
                   OUTPUT_VARIABLE develop_branch
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(HYPRE_DEVELOP_STRING  ${develop_string})
-  set(HYPRE_DEVELOP_NUMBER  ${develop_number})
-  if (develop_branch MATCHES "master")
-    set(HYPRE_DEVELOP_BRANCH  ${develop_branch})
+  if (${develop_string} MATCHES ".*")
+    set(HYPRE_DEVELOP_STRING  ${develop_string})
+    set(HYPRE_DEVELOP_NUMBER  ${develop_number})
+    if (develop_branch MATCHES "master")
+      set(HYPRE_DEVELOP_BRANCH  ${develop_branch})
+    else ()
+      message(STATUS "NOTE: On branch ${develop_branch}, not the main development branch")
+    endif ()
   else ()
-    message(STATUS "NOTE: On branch ${develop_branch}, not the main development branch")
+    message(STATUS "NOTE: Could not describe development branch")
   endif ()
 else ()
   message(STATUS "NOTE: Could not find .git directory")
diff --git a/src/config/configure.in b/src/config/configure.in
index 2195e6e7a..ced7954fb 100644
--- a/src/config/configure.in
+++ b/src/config/configure.in
@@ -106,16 +106,23 @@ AC_SUBST(HYPRE_BUGS)
 AC_SUBST(HYPRE_SRCDIR)
 
 AC_CHECK_FILE([$HYPRE_SRCDIR/../.git],
-  [develop_string=$(git -C $HYPRE_SRCDIR describe --match 'v*' --long --abbrev=9)
-   develop_lastag=$(git -C $HYPRE_SRCDIR describe --match 'v*' --abbrev=0)
-   develop_number=$(git -C $HYPRE_SRCDIR rev-list --count $develop_lastag..HEAD)
-   develop_branch=$(git -C $HYPRE_SRCDIR rev-parse --abbrev-ref HEAD)
-   AC_DEFINE_UNQUOTED(HYPRE_DEVELOP_STRING, ["$develop_string"], [Develop branch string])
-   AC_DEFINE_UNQUOTED(HYPRE_DEVELOP_NUMBER, [$develop_number],   [Develop branch commit number])
-   AS_IF([test "x$develop_branch" = "xmaster"],
-     [AC_DEFINE_UNQUOTED(HYPRE_DEVELOP_BRANCH, ["$develop_branch"], [Main development branch?])],
-     [AC_MSG_NOTICE([NOTE: On branch $develop_branch, not the main development branch])]
-   )],
+  [
+  develop_string=$(git -C $HYPRE_SRCDIR describe --match 'v*' --long --abbrev=9)
+  develop_lastag=$(git -C $HYPRE_SRCDIR describe --match 'v*' --abbrev=0)
+  develop_number=$(git -C $HYPRE_SRCDIR rev-list --count $develop_lastag..HEAD)
+  develop_branch=$(git -C $HYPRE_SRCDIR rev-parse --abbrev-ref HEAD)
+  AS_IF([test -n "$develop_string"],
+    [
+    AC_DEFINE_UNQUOTED(HYPRE_DEVELOP_STRING, ["$develop_string"], [Develop branch string])
+    AC_DEFINE_UNQUOTED(HYPRE_DEVELOP_NUMBER, [$develop_number],   [Develop branch commit number])
+    AS_IF([test "x$develop_branch" = "xmaster"],
+      [AC_DEFINE_UNQUOTED(HYPRE_DEVELOP_BRANCH, ["$develop_branch"], [Main development branch?])],
+      [AC_MSG_NOTICE([NOTE: On branch $develop_branch, not the main development branch])]
+    )
+    ],
+    [AC_MSG_NOTICE([NOTE: Could not describe development branch])]
+  )
+  ],
   [AC_MSG_NOTICE([NOTE: Could not find .git directory])]
 )
 
diff --git a/src/configure b/src/configure
index 2860a4c93..3ff5738e7 100755
--- a/src/configure
+++ b/src/configure
@@ -2701,10 +2701,13 @@ eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+
   develop_string=$(git -C $HYPRE_SRCDIR describe --match 'v*' --long --abbrev=9)
-   develop_lastag=$(git -C $HYPRE_SRCDIR describe --match 'v*' --abbrev=0)
-   develop_number=$(git -C $HYPRE_SRCDIR rev-list --count $develop_lastag..HEAD)
-   develop_branch=$(git -C $HYPRE_SRCDIR rev-parse --abbrev-ref HEAD)
+  develop_lastag=$(git -C $HYPRE_SRCDIR describe --match 'v*' --abbrev=0)
+  develop_number=$(git -C $HYPRE_SRCDIR rev-list --count $develop_lastag..HEAD)
+  develop_branch=$(git -C $HYPRE_SRCDIR rev-parse --abbrev-ref HEAD)
+  if test -n "$develop_string"; then :
+
 
 cat >>confdefs.h <<_ACEOF
 #define HYPRE_DEVELOP_STRING "$develop_string"
@@ -2715,7 +2718,7 @@ cat >>confdefs.h <<_ACEOF
 #define HYPRE_DEVELOP_NUMBER $develop_number
 _ACEOF
 
-   if test "x$develop_branch" = "xmaster"; then :
+    if test "x$develop_branch" = "xmaster"; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HYPRE_DEVELOP_BRANCH "$develop_branch"
@@ -2726,6 +2729,13 @@ else
 $as_echo "$as_me: NOTE: On branch $develop_branch, not the main development branch" >&6;}
 
 fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: NOTE: Could not describe development branch" >&5
+$as_echo "$as_me: NOTE: Could not describe development branch" >&6;}
+
+fi
+
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: NOTE: Could not find .git directory" >&5
 $as_echo "$as_me: NOTE: Could not find .git directory" >&6;}
diff --git a/src/test/Makefile b/src/test/Makefile
index c03a8f454..ed519ac0b 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -14,7 +14,6 @@ CXXDEFS = -DNOFEI -DHYPRE_TIMING -DMPICH_SKIP_MPICXX
 
 C_COMPILE_FLAGS = \
  -I$(srcdir)\
- -I$(srcdir)/..\
  -I${HYPRE_BUILD_DIR}/include\
  $(SUPERLU_INCLUDE)\
  $(DSUPERLU_INCLUDE)\
@@ -23,7 +22,6 @@ C_COMPILE_FLAGS = \
 
 CXX_COMPILE_FLAGS = \
  -I$(srcdir)\
- -I$(srcdir)/..\
  -I$(srcdir)/../FEI_mv/fei-base\
  -I${HYPRE_BUILD_DIR}/include\
  $(SUPERLU_INCLUDE)\
@@ -33,7 +31,6 @@ CXX_COMPILE_FLAGS = \
 
 F77_COMPILE_FLAGS = \
  -I$(srcdir)\
- -I$(srcdir)/..\
  -I${HYPRE_BUILD_DIR}/include\
  ${CINCLUDES}
 
diff --git a/src/test/TEST_ij/versioncheck.sh b/src/test/TEST_ij/versioncheck.sh
index a035b3af8..7f7de186f 100755
--- a/src/test/TEST_ij/versioncheck.sh
+++ b/src/test/TEST_ij/versioncheck.sh
@@ -12,19 +12,20 @@ TNAME=`basename $0 .sh`
 
 grep "Using HYPRE_DEVELOP_STRING" ${TNAME}.out.1 > ${TNAME}.testdata
 
+echo -n > ${TNAME}.testdatacheck
 if [ -d ../../../.git ]; then
-  DEVSTRING=`git describe --match 'v*' --long --abbrev=9`
+  DEVSTRING=`git describe --match 'v*' --long --abbrev=9 2>/dev/null`
   DEVNUMBER=`echo $DEVSTRING | awk -F- '{print $2}'`
   DEVBRANCH=`git rev-parse --abbrev-ref HEAD`
-  if [ "$DEVBRANCH" != "master" ]; then
-    echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (not main development branch)" \
-     > ${TNAME}.testdatacheck
-  else
-    echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (main development branch $DEVBRANCH)" \
-     > ${TNAME}.testdatacheck
+  if [ -n "$DEVSTRING" ]; then
+    if [ "$DEVBRANCH" != "master" ]; then
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (not main development branch)" \
+       > ${TNAME}.testdatacheck
+    else
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (main development branch $DEVBRANCH)" \
+       > ${TNAME}.testdatacheck
+    fi
   fi
-else
-  echo -n > ${TNAME}.testdatacheck
 fi
 diff ${TNAME}.testdata ${TNAME}.testdatacheck >&2
 
diff --git a/src/test/TEST_sstruct/versioncheck.sh b/src/test/TEST_sstruct/versioncheck.sh
index a035b3af8..7f7de186f 100755
--- a/src/test/TEST_sstruct/versioncheck.sh
+++ b/src/test/TEST_sstruct/versioncheck.sh
@@ -12,19 +12,20 @@ TNAME=`basename $0 .sh`
 
 grep "Using HYPRE_DEVELOP_STRING" ${TNAME}.out.1 > ${TNAME}.testdata
 
+echo -n > ${TNAME}.testdatacheck
 if [ -d ../../../.git ]; then
-  DEVSTRING=`git describe --match 'v*' --long --abbrev=9`
+  DEVSTRING=`git describe --match 'v*' --long --abbrev=9 2>/dev/null`
   DEVNUMBER=`echo $DEVSTRING | awk -F- '{print $2}'`
   DEVBRANCH=`git rev-parse --abbrev-ref HEAD`
-  if [ "$DEVBRANCH" != "master" ]; then
-    echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (not main development branch)" \
-     > ${TNAME}.testdatacheck
-  else
-    echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (main development branch $DEVBRANCH)" \
-     > ${TNAME}.testdatacheck
+  if [ -n "$DEVSTRING" ]; then
+    if [ "$DEVBRANCH" != "master" ]; then
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (not main development branch)" \
+       > ${TNAME}.testdatacheck
+    else
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (main development branch $DEVBRANCH)" \
+       > ${TNAME}.testdatacheck
+    fi
   fi
-else
-  echo -n > ${TNAME}.testdatacheck
 fi
 diff ${TNAME}.testdata ${TNAME}.testdatacheck >&2
 
diff --git a/src/test/TEST_struct/versioncheck.sh b/src/test/TEST_struct/versioncheck.sh
index a035b3af8..7f7de186f 100755
--- a/src/test/TEST_struct/versioncheck.sh
+++ b/src/test/TEST_struct/versioncheck.sh
@@ -12,19 +12,20 @@ TNAME=`basename $0 .sh`
 
 grep "Using HYPRE_DEVELOP_STRING" ${TNAME}.out.1 > ${TNAME}.testdata
 
+echo -n > ${TNAME}.testdatacheck
 if [ -d ../../../.git ]; then
-  DEVSTRING=`git describe --match 'v*' --long --abbrev=9`
+  DEVSTRING=`git describe --match 'v*' --long --abbrev=9 2>/dev/null`
   DEVNUMBER=`echo $DEVSTRING | awk -F- '{print $2}'`
   DEVBRANCH=`git rev-parse --abbrev-ref HEAD`
-  if [ "$DEVBRANCH" != "master" ]; then
-    echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (not main development branch)" \
-     > ${TNAME}.testdatacheck
-  else
-    echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (main development branch $DEVBRANCH)" \
-     > ${TNAME}.testdatacheck
+  if [ -n "$DEVSTRING" ]; then
+    if [ "$DEVBRANCH" != "master" ]; then
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (not main development branch)" \
+       > ${TNAME}.testdatacheck
+    else
+      echo "Using HYPRE_DEVELOP_STRING: $DEVSTRING (main development branch $DEVBRANCH)" \
+       > ${TNAME}.testdatacheck
+    fi
   fi
-else
-  echo -n > ${TNAME}.testdatacheck
 fi
 diff ${TNAME}.testdata ${TNAME}.testdatacheck >&2