diff --git a/source/blender/blenloader/tests/blendfile_load_test.cc b/source/blender/blenloader/tests/blendfile_load_test.cc
index 00f596adc33..58535852fbc 100644
--- a/source/blender/blenloader/tests/blendfile_load_test.cc
+++ b/source/blender/blenloader/tests/blendfile_load_test.cc
@@ -2,13 +2,15 @@
  * Copyright 2019 Blender Foundation. */
 #include "blendfile_loading_base_test.h"
 
+#include "BLI_path_util.h"
+
 class BlendfileLoadingTest : public BlendfileLoadingBaseTest {
 };
 
 TEST_F(BlendfileLoadingTest, CanaryTest)
 {
   /* Load the smallest blend file we have in the SVN lib/tests directory. */
-  if (!blendfile_load("modifier_stack/array_test.blend")) {
+  if (!blendfile_load("modifier_stack" SEP_STR "array_test.blend")) {
     return;
   }
   depsgraph_create(DAG_EVAL_RENDER);
diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
index dafa344d039..d4b20818258 100644
--- a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
+++ b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
@@ -6,6 +6,7 @@
 
 #include "BKE_scene.h"
 #include "BLI_math.h"
+#include "BLI_path_util.h"
 #include "BLO_readfile.h"
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
@@ -122,7 +123,7 @@ class AbstractHierarchyIteratorTest : public BlendfileLoadingBaseTest {
 TEST_F(AbstractHierarchyIteratorTest, ExportHierarchyTest)
 {
   /* Load the test blend file. */
-  if (!blendfile_load("usd/usd_hierarchy_export_test.blend")) {
+  if (!blendfile_load("usd" SEP_STR "usd_hierarchy_export_test.blend")) {
     return;
   }
   depsgraph_create(DAG_EVAL_RENDER);
@@ -200,7 +201,7 @@ TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest)
    * so not included here. Update this test when hair & particle systems are included. */
 
   /* Load the test blend file. */
-  if (!blendfile_load("usd/usd_hierarchy_export_test.blend")) {
+  if (!blendfile_load("usd" SEP_STR "usd_hierarchy_export_test.blend")) {
     return;
   }
   depsgraph_create(DAG_EVAL_RENDER);
@@ -320,7 +321,7 @@ class AbstractHierarchyIteratorInvisibleTest : public AbstractHierarchyIteratorT
 
 TEST_F(AbstractHierarchyIteratorInvisibleTest, ExportInvisibleTest)
 {
-  if (!blendfile_load("alembic/visibility.blend")) {
+  if (!blendfile_load("alembic" SEP_STR "visibility.blend")) {
     return;
   }
   depsgraph_create(DAG_EVAL_RENDER);
diff --git a/source/blender/io/ply/tests/io_ply_importer_test.cc b/source/blender/io/ply/tests/io_ply_importer_test.cc
index 06bf02f6024..652c302a747 100644
--- a/source/blender/io/ply/tests/io_ply_importer_test.cc
+++ b/source/blender/io/ply/tests/io_ply_importer_test.cc
@@ -24,7 +24,8 @@ class ply_import_test : public testing::Test {
  public:
   void import_and_check(const char *path, const Expectation &exp)
   {
-    std::string ply_path = blender::tests::flags_test_asset_dir() + "/io_tests/ply/" + path;
+    std::string ply_path = blender::tests::flags_test_asset_dir() +
+                           SEP_STR "io_tests" SEP_STR "ply" SEP_STR + path;
 
     /* Use a small read buffer size for better coverage of buffer refilling behavior. */
     PlyReadBuffer infile(ply_path.c_str(), 128);
diff --git a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
index 1fbafef84cb..020c59bbfdf 100644
--- a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
+++ b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
@@ -67,12 +67,13 @@ class obj_importer_test : public BlendfileLoadingBaseTest {
                         int expect_mat_count,
                         int expect_image_count = 0)
   {
-    if (!blendfile_load("io_tests/blend_geometry/all_quads.blend")) {
+    if (!blendfile_load("io_tests" SEP_STR "blend_geometry" SEP_STR "all_quads.blend")) {
       ADD_FAILURE();
       return;
     }
 
-    std::string obj_path = blender::tests::flags_test_asset_dir() + "/io_tests/obj/" + path;
+    std::string obj_path = blender::tests::flags_test_asset_dir() +
+                           SEP_STR "io_tests" SEP_STR "obj" SEP_STR + path;
     strncpy(params.filepath, obj_path.c_str(), FILE_MAX - 1);
     const size_t read_buffer_size = 650;
     importer_main(bfile->main, bfile->curscene, bfile->cur_view_layer, params, read_buffer_size);
diff --git a/source/blender/sequencer/intern/proxy.c b/source/blender/sequencer/intern/proxy.c
index c1a7e17035a..27475ae62e0 100644
--- a/source/blender/sequencer/intern/proxy.c
+++ b/source/blender/sequencer/intern/proxy.c
@@ -179,7 +179,7 @@ static bool seq_proxy_get_fname(Scene *scene,
 
   BLI_snprintf(filepath,
                PROXY_MAXFILE,
-               "%s/images/%d/%s_proxy%s.jpg",
+               "%s" SEP_STR "images" SEP_STR "%d" SEP_STR "%s_proxy%s.jpg",
                dirpath,
                proxy_size_number,
                SEQ_render_give_stripelem(scene, seq, timeline_frame)->filename,