diff --git a/src/test/fspp/fuse/FuseTest.cpp b/src/test/fspp/fuse/FuseTest.cpp
index 9394b779..d1fd3630 100644
--- a/src/test/fspp/fuse/FuseTest.cpp
+++ b/src/test/fspp/fuse/FuseTest.cpp
@@ -35,15 +35,11 @@ TEST_F(FuseTest, setupAndTearDown) {
 
 TEST_F(FuseTest, openFile) {
   const char *filename = "/myfile";
-  EXPECT_CALL(fsimpl, lstat(StrEq(filename), _))
-      .WillOnce(Invoke([](const char*, struct ::stat* result) {
+  EXPECT_CALL(fsimpl, lstat(StrEq(filename), _)).WillOnce(Invoke([](const char*, struct ::stat* result) {
     result->st_mode = S_IFREG;
   }));
-  EXPECT_CALL(fsimpl, openFile(StrEq(filename), _))
-      .WillOnce(Invoke([](const char*, int flags) {
-    EXPECT_EQ(O_RDWR, O_ACCMODE & flags);
-    return 0;
-  }));
+  EXPECT_CALL(fsimpl, openFile(StrEq(filename), OpenFlagsEq(O_RDWR)))
+    .Times(1);
 
   auto fs = TestFS();
 
diff --git a/src/test/testutils/FuseTest.h b/src/test/testutils/FuseTest.h
index 86e2a85b..532f27be 100644
--- a/src/test/testutils/FuseTest.h
+++ b/src/test/testutils/FuseTest.h
@@ -120,4 +120,8 @@ public:
   MockFilesystem fsimpl;
 };
 
+MATCHER_P(OpenFlagsEq, expectedFlags, "") {
+  return expectedFlags == (O_ACCMODE & arg);
+}
+
 #endif