diff --git a/test/csync/csync_tests/check_csync_exclude.cpp b/test/csync/csync_tests/check_csync_exclude.cpp
index b090a2613..1a0dca0f1 100644
--- a/test/csync/csync_tests/check_csync_exclude.cpp
+++ b/test/csync/csync_tests/check_csync_exclude.cpp
@@ -652,8 +652,8 @@ static void check_csync_excluded_performance(void **)
 
         gettimeofday(&after, nullptr);
 
-        const double total = (after.tv_sec - before.tv_sec)
-                + (after.tv_usec - before.tv_usec) / 1.0e6;
+        const auto total = static_cast<double>(after.tv_sec - before.tv_sec)
+                + static_cast<double>(after.tv_usec - before.tv_usec) / 1.0e6;
         const double perCallMs = total / 2 / N * 1000;
         printf("csync_excluded: %f ms per call\n", perCallMs);
     }
@@ -670,8 +670,8 @@ static void check_csync_excluded_performance(void **)
 
         gettimeofday(&after, nullptr);
 
-        const double total = (after.tv_sec - before.tv_sec)
-                + (after.tv_usec - before.tv_usec) / 1.0e6;
+        const auto total = static_cast<double>(after.tv_sec - before.tv_sec)
+                + static_cast<double>(after.tv_usec - before.tv_usec) / 1.0e6;
         const double perCallMs = total / 2 / N * 1000;
         printf("csync_excluded_traversal: %f ms per call\n", perCallMs);
     }
diff --git a/test/csync/vio_tests/check_vio_ext.cpp b/test/csync/vio_tests/check_vio_ext.cpp
index 793b363d0..ab1b3fb1d 100644
--- a/test/csync/vio_tests/check_vio_ext.cpp
+++ b/test/csync/vio_tests/check_vio_ext.cpp
@@ -230,7 +230,7 @@ static void traverse_dir(void **state, const char *dir, int *cnt)
             if( !sv->result ) {
                 sv->result = c_strdup( subdir_out);
             } else {
-                int newlen = 1+strlen(sv->result)+strlen(subdir_out);
+                const auto newlen = 1 + strlen(sv->result)+strlen(subdir_out);
                 char *tmp = sv->result;
                 sv->result = (char*)c_malloc(newlen);
                 strcpy( sv->result, tmp);
@@ -406,7 +406,7 @@ static void check_readdir_longtree(void **state)
 "<DIR> C:/tmp/csync_test/vierzig/mann/auf/des/toten/Mann/kiste/ooooooooooooooooooooooh/and/ne/bottle/voll/rum/und/so/singen/wir/VIERZIG/MANN/AUF/DES/TOTEN/MANNS/KISTE/OOOOOOOOH/AND/NE/BOTTLE/VOLL/RUM/undnochmalallezusammen/VierZig/MannaufDesTotenManns/KISTE/ooooooooooooooooooooooooooohhhhhh/und/BESSER/ZWEI/Butteln/VOLL RUM";
 
     /* assemble the result string ... */
-    int overall_len = 1+strlen(r1)+strlen(r2)+strlen(r3);
+    const auto overall_len = 1 + strlen(r1) + strlen(r2) + strlen(r3);
     int files_cnt = 0;
     char *result = (char*)c_malloc(overall_len);
     *result = '\0';