diff --git a/src/libCom/test/Makefile b/src/libCom/test/Makefile
index fd4800953..6bd9f8232 100755
--- a/src/libCom/test/Makefile
+++ b/src/libCom/test/Makefile
@@ -184,6 +184,11 @@ epicsMessageQueueTest_SRCS += epicsMessageQueueTest.cpp
 testHarness_SRCS += epicsMessageQueueTest.cpp
 TESTS += epicsMessageQueueTest
 
+TESTPROD_HOST += epicsStackTraceTest
+epicsStackTraceTest_SRCS += epicsStackTraceTest.c
+testHarness_SRCS += epicsStackTraceTest.c
+TESTS += epicsStackTraceTest
+
 
 # The testHarness runs all the test programs in a known working order.
 testHarness_SRCS += epicsRunLibComTests.c
diff --git a/src/libCom/test/epicsStackTraceTest.c b/src/libCom/test/epicsStackTraceTest.c
new file mode 100644
index 000000000..d7166a47d
--- /dev/null
+++ b/src/libCom/test/epicsStackTraceTest.c
@@ -0,0 +1,215 @@
+/* 
+ * Copyright: Stanford University / SLAC National Laboratory.
+ *
+ * EPICS BASE is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution. 
+ *
+ * Author: Till Straumann <strauman@slac.stanford.edu>, 2014
+ */ 
+
+/*
+ * Check stack trace functionality
+ */
+
+#include "epicsStackTrace.h"
+#include "errlog.h"
+#include "epicsUnitTest.h"
+#include "testMain.h"
+#include "inttypes.h"
+
+#include <string.h>
+
+#undef TEST_DEBUG
+
+#define TST_BUFSZ 10000
+
+#define MAXP      10
+
+/* estimated size of (compiled) epicsStackTraceRecurseGbl */
+#define WINDOW_SZ  400
+
+typedef struct TestDataRec_ {
+	char buf[TST_BUFSZ];
+	int  pos;
+} TestDataRec, *TestData;
+
+typedef void (*RecFn)(int);
+
+/* We want a stack trace and need a few nested routines.
+ * The whole magic here is intended to prevent a compiler
+ * from optimizing the call stack away:
+ *   - call via a volatile pointer
+ *   - add a call to a no-op function at the end so that
+ *     tail-call optimization doesn't eliminate the call
+ *     stack.
+ *
+ * We use a local (static) and a global routine to test
+ * if the stacktrace supports either flavor.
+ */
+
+void epicsStackTraceRecurseGbl(int lvl);
+static void epicsStackTraceRecurseLcl(int lvl);
+
+void nopFn(int lvl)
+{
+}
+
+RecFn volatile lfp = epicsStackTraceRecurseLcl;
+RecFn volatile gfp = epicsStackTraceRecurseGbl;
+RecFn volatile nop = nopFn;
+
+static void
+epicsStackTraceRecurseLcl(int lvl)
+{
+	if ( lvl )
+		gfp(lvl-1);
+	else
+		epicsStackTrace();
+
+	/* call something so that the call through gfp() doesn't
+     * get optimized into a jump (tail-call optimization)
+	 */
+	nop(0);
+}
+
+void epicsStackTraceRecurseGbl(int lvl)
+{
+	if ( lvl )
+		lfp(lvl-1);
+	else
+		epicsStackTrace();
+
+	/* call something so that the call through gfp() doesn't
+     * get optimized into a jump (tail-call optimization)
+	 */
+	nop(0);
+}
+
+static void logClient(void *ptr, const char *msg)
+{
+TestData td = ptr;
+size_t        sz = strlen(msg);
+size_t        mx = sizeof(td->buf) - td->pos - 1;
+
+	if ( sz > mx )
+		sz = mx;
+	strncpy( td->buf+td->pos, msg, sz );
+	td->pos += sz;
+}
+
+static int
+findStringOcc(const char *buf, const char *what)
+{
+int         rval;
+size_t      l = strlen(what);
+
+	for ( rval=0; (buf=strstr(buf, what)); buf+=l )
+		rval++;
+
+#ifdef TEST_DEBUG
+	printf("found %i x %s\n", rval, what);
+#endif
+
+	return rval;
+}
+
+static int
+findNumOcc(const char *buf)
+{
+void     *ptrs[MAXP];
+int       n_ptrs = 0;
+int       i,j;
+int       rval   = 0;
+
+	while ( n_ptrs < sizeof(ptrs)/sizeof(*ptrs[0]) && (buf=strchr(buf,'[')) ) {
+		if ( 1 == sscanf(buf+1,"%p", &ptrs[n_ptrs]) )
+			n_ptrs++;
+		buf++;
+	}
+	/* We should find an address close to epicsStackTraceRecurseGbl twice */
+	for (i=0; i<n_ptrs-1; i++) {
+		/* I got a (unjustified) index-out-of-bound warning 
+		 * when setting j=i+1 here. Thus the weird j!= i check...
+		 */
+		j = i;
+		while ( j < n_ptrs ) {
+			if ( j != i && ptrs[j] == ptrs[i] ) {
+				if ( ptrs[i] >= (void*)epicsStackTraceRecurseGbl && ptrs[i] < (void*)epicsStackTraceRecurseGbl + WINDOW_SZ ) {
+					rval ++;	
+#ifdef TEST_DEBUG
+					printf("found address %p again\n", ptrs[i]);
+#endif
+				}
+			}
+			j++;
+		}
+	}
+	return rval;
+}
+
+MAIN(epicsStackTraceTest)
+{
+int         features, all_features;
+TestDataRec testData;
+int         gblFound, lclFound, numFound;
+
+	testData.pos = 0;
+
+	testPlan(4);
+
+	features = epicsStackTraceGetFeatures(); 
+
+	all_features =   EPICS_STACKTRACE_LCL_SYMBOLS
+	               | EPICS_STACKTRACE_GBL_SYMBOLS
+	               | EPICS_STACKTRACE_ADDRESSES;
+		
+	if ( ! testOk( (features & ~all_features) == 0,
+	          "epicsStackTraceGetFeatures() obtains features") )
+		testAbort("epicsStackTraceGetFeatures() not working as expected");
+
+	testData.pos = 0;
+
+	testDiag("calling a few nested routines and eventually dump a stack trace");
+
+	eltc(0);
+	errlogAddListener( logClient, &testData );
+	epicsStackTraceRecurseGbl(3);
+	errlogRemoveListeners( logClient, &testData );
+	eltc(1);
+
+	/* ensure there's a terminating NUL -- we have reserved space for it */
+	testData.buf[testData.pos] = 0;
+
+	testDiag("now scan the result for what we expect");
+
+	gblFound = findStringOcc( testData.buf, "epicsStackTraceRecurseGbl" );
+	lclFound = findStringOcc( testData.buf, "epicsStackTraceRecurseLcl" );
+	numFound = findNumOcc   ( testData.buf );
+	
+	if ( (features & EPICS_STACKTRACE_GBL_SYMBOLS) ) {
+		testOk( gblFound == 2, "dumping global symbols" );
+	} else {
+		testOk( 1            , "no support for dumping global symbols on this platform");
+	}
+
+	if ( (features & EPICS_STACKTRACE_LCL_SYMBOLS) ) {
+		testOk( lclFound == 2, "dumping local symbols" );
+	} else {
+		testOk( 1            , "no support for dumping local symbols on this platform");
+	}
+
+	if ( (features & EPICS_STACKTRACE_ADDRESSES) ) {
+		testOk(  numFound > 0, "dumping addresses" );
+	} else {
+		testOk( 1            , "no support for dumping addresses on this platform");
+	}
+
+
+#ifdef TEST_DEBUG
+	fputs(testData.buf, stdout);
+#endif
+
+	testDone();
+
+	return 0;
+}