diff --git a/src/libCom/test/Makefile b/src/libCom/test/Makefile
index 7ef6e252b..154b2198f 100644
--- a/src/libCom/test/Makefile
+++ b/src/libCom/test/Makefile
@@ -23,8 +23,9 @@ OBJS_IOC += threadTest
 #fdmgrTest_SRCS += fdmgrTest.c
 #PROD += fdmgrTest
 
-osiTimeTest_SRCS += osiTimeTest.cc
-PROD += osiTimeTest
+osiTimeTestHost_SRCS += osiTimeTestMain.c osiTimeTest.cc
+PROD += osiTimeTestHost
+OBJS_IOC += osiTimeTest
 
 SYS_PROD_LIBS_solaris += pthread thread posix4
 
diff --git a/src/libCom/test/osiTimeTest.cc b/src/libCom/test/osiTimeTest.cc
index f54e3414e..1b41c213e 100644
--- a/src/libCom/test/osiTimeTest.cc
+++ b/src/libCom/test/osiTimeTest.cc
@@ -6,8 +6,11 @@
 #include "osiThread.h"
 #include "epicsAssert.h"
 
+extern "C" {
+int osiTimeTest (void);
+}
 
-int main ()
+int osiTimeTest (void)
 {
 	unsigned i;
 	osiTime begin = osiTime::getCurrent();
diff --git a/src/libCom/test/osiTimeTestMain.c b/src/libCom/test/osiTimeTestMain.c
new file mode 100644
index 000000000..3fdf3eb90
--- /dev/null
+++ b/src/libCom/test/osiTimeTestMain.c
@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+int osiTimeTest (void);
+
+int main (int argc, char **argv)
+{
+	return osiTimeTest ();
+}