diff --git a/src/test/obj_rpmem_heap_interrupt/TEST0 b/src/test/obj_rpmem_heap_interrupt/TEST0
index e31ac127d5f8ec9d9635f974baa2f9bcf4437cd5..5abd689b8a0a17dd6235d67d51dd0dd7658d6f9e 100755
--- a/src/test/obj_rpmem_heap_interrupt/TEST0
+++ b/src/test/obj_rpmem_heap_interrupt/TEST0
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2018, Intel Corporation
+# Copyright 2016-2019, Intel Corporation
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,8 @@ require_nodes 2
 require_node_libfabric 0 $RPMEM_PROVIDER
 require_node_libfabric 1 $RPMEM_PROVIDER
 
-init_rpmem_on_node 1 0
+PID_FILE=rpmemd.pid
+init_rpmem_on_node 1 0:$PID_FILE
 
 # binary for this test
 EXE=obj_heap_interrupt
@@ -81,7 +82,12 @@ create_holey_file_on_node 0 9M ${NODE_DIR[0]}$TEST_FILE_REMOTE
 
 # execute test
 expect_normal_exit run_on_node 1 ./$EXE$EXESUFFIX ${NODE_DIR[1]}$TEST_SET_LOCAL c 0
+
+# pmempool rm expects flock from the remote parts are released otherwise it will
+# fail to delete them so it has to wait for rpmemd to exit
+expect_abnormal_exit wait_on_node 0 $PID_FILE
 expect_normal_exit run_on_node 1 ../pmempool rm -sf ${NODE_DIR[1]}$TEST_SET_LOCAL
+
 expect_normal_exit run_on_node 1 ../pmempool create --layout heap_interrupt obj ${NODE_DIR[1]}$TEST_SET_LOCAL
 expect_normal_exit run_on_node 1 ./$EXE$EXESUFFIX ${NODE_DIR[1]}$TEST_SET_LOCAL o 0