diff --git a/orte/mca/regx/fwd/configure.m4 b/orte/mca/regx/fwd/configure.m4
new file mode 100644
index 00000000000..4a817a12af4
--- /dev/null
+++ b/orte/mca/regx/fwd/configure.m4
@@ -0,0 +1,27 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2018      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_patcher_overwrite_CONFIG(action-if-can-compile,
+#                        [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_orte_regx_fwd_CONFIG],[
+    AC_CONFIG_FILES([orte/mca/regx/fwd/Makefile])
+    [$1]
+])
+
+#
+# Force this component to compile in static-only mode
+#
+AC_DEFUN([MCA_orte_regx_fwd_COMPILE_MODE],[
+    AC_MSG_CHECKING([for MCA component $2:$3 compile mode])
+    $4="static"
+    AC_MSG_RESULT([$$4])
+])
diff --git a/test/util/Makefile.am b/test/util/Makefile.am
index 75f18339ae2..afb1ba2f1ca 100644
--- a/test/util/Makefile.am
+++ b/test/util/Makefile.am
@@ -32,8 +32,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/test/support
 #        opal_os_create_dirpath \
 #        opal_argv \
 #        opal_basename \
-#        opal_path_nfs \
-#        orte_nidmap
+#        opal_path_nfs
 
 
 check_PROGRAMS = \
@@ -41,6 +40,11 @@ check_PROGRAMS = \
 	opal_path_nfs \
 	bipartite_graph
 
+if PROJECT_ORTE
+check_PROGRAMS += \
+	orte_nidmap
+endif
+
 TESTS = \
 	$(check_PROGRAMS)
 
@@ -122,11 +126,12 @@ opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD)
 #        $(top_builddir)/test/support/libsupport.a
 #orte_universe_setup_file_io_DEPENDENCIES = $(orte_universe_setup_file_io_LDADD)
 
-#orte_nidmap_SOURCES = orte_nidmap.c
-#orte_nidmap_LDADD = \
-#        $(top_builddir)/orte/libopen-rte.la \
-#        $(top_builddir)/test/support/libsupport.a
-#orte_nidmap_DEPENDENCIES = $(orte_nidmap_LDADD)
+orte_nidmap_SOURCES = orte_nidmap.c
+orte_nidmap_LDADD = \
+        $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
+        $(top_builddir)/test/support/libsupport.a
+orte_nidmap_DEPENDENCIES = $(orte_nidmap_LDADD)
 
 bipartite_graph_SOURCES = bipartite_graph.c
 bipartite_graph_LDADD = \