diff --git a/src/test/obj_memops/obj_memops.c b/src/test/obj_memops/obj_memops.c
index 82bd8f147f23700e203c9e59224014f6dad5eab8..3f24b605abff0d0ba04fe8bf07a6f95b24ca5b78 100644
--- a/src/test/obj_memops/obj_memops.c
+++ b/src/test/obj_memops/obj_memops.c
@@ -43,7 +43,7 @@
 
 #define TEST_ENTRIES 256
 
-#define TEST_VALUES 128
+#define TEST_VALUES TEST_ENTRIES
 
 enum fail_types {
 	FAIL_NONE,
@@ -101,6 +101,8 @@ test_set_entries(PMEMobjpool *pop,
 {
 	operation_start(ctx);
 
+	UT_ASSERT(nentries <= ARRAY_SIZE(object->values));
+
 	for (size_t i = 0; i < nentries; ++i) {
 		operation_add_typed_entry(ctx,
 			&object->values[i], i + 1,