diff --git a/testCa/Makefile b/testCa/Makefile
index 92522c9..207a61c 100644
--- a/testCa/Makefile
+++ b/testCa/Makefile
@@ -17,7 +17,7 @@ PROD_LIBS += pvAccess pvAccessCA pvData $(EPICS_BASE_IOC_LIBS)
 PROD_SYS_LIBS_WIN32 += netapi32 ws2_32
 
 ifdef BASE_3_16
-  testCaProvider_SRCS_RTEMS += rtemsTestData.c
+  PROD_SRCS_RTEMS += rtemsTestData.c
   testCaProvider_SRCS += testIoc_registerRecordDeviceDriver.cpp
   REGRDDFLAGS = -l
 
diff --git a/testCa/testConveyor.cpp b/testCa/testConveyor.cpp
index bdf579b..6511570 100644
--- a/testCa/testConveyor.cpp
+++ b/testCa/testConveyor.cpp
@@ -130,7 +130,7 @@ void testOperation(void)
             testFail("Client's notify() not called");
 
         c1.reset();     // Clean up c1
-        if (!cgone.tryWait())
+        if (!cgone.wait(TIMEOUT))
             testFail("Client's destructor not called");
 
         testDiag("2. Queue accepts notification while conveyor is busy.");