diff --git a/libpurgeablemem/test/purgeable_c_test.cpp b/libpurgeablemem/test/purgeable_c_test.cpp
index b2c2f0f77331d09d5f06611dd84a8e46ec3b0acd..50611ccc8aeae75aadd28c6c7bd3d95f7b568366 100644
--- a/libpurgeablemem/test/purgeable_c_test.cpp
+++ b/libpurgeablemem/test/purgeable_c_test.cpp
@@ -213,7 +213,7 @@ bool ModifyData_(void *data, size_t size, char src, char dst)
 {
     char *str = (char *)data;
     size_t i = 0;
-    for (; str[i] && i < size; i++) {
+    for (; i < size && str[i]; i++) {
         if (str[i] == src) {
             str[i] = dst;
         }
diff --git a/libpurgeablemem/test/purgeable_cpp_test.cpp b/libpurgeablemem/test/purgeable_cpp_test.cpp
index 218c51323a7ba5f1df570623f9c1ff61f685d630..c23f67520756286b7cccd38b1aad3b49ae5f33c5 100644
--- a/libpurgeablemem/test/purgeable_cpp_test.cpp
+++ b/libpurgeablemem/test/purgeable_cpp_test.cpp
@@ -77,7 +77,7 @@ public:
     bool Build(void *data, size_t size)
     {
         char *str = static_cast<char *>(data);
-        for (size_t i = 0; str[i] && i < size; i++) {
+        for (size_t i = 0; i < size && str[i]; i++) {
             if (str[i] == from) {
                 str[i] = to;
             }