diff --git a/src/emitters/tests/data/__init__.py b/src/emitters/tests/data/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/emitters/tests/data/triangle.ply b/src/emitters/tests/data/triangle.ply
deleted file mode 100644
index ad2c269ea..000000000
--- a/src/emitters/tests/data/triangle.ply
+++ /dev/null
@@ -1,14 +0,0 @@
-ply
-format ascii 1.0
-comment this file contains a triangle
-element vertex 3
-property float x
-property float y
-property float z
-element face 1
-property list uchar int vertex_index
-end_header
-0 0 0
-0 0 1
-0 1 0
-3 0 1 2
diff --git a/src/emitters/tests/test_area.py b/src/emitters/tests/test_area.py
index 0d0fe8afd..a4120888f 100644
--- a/src/emitters/tests/test_area.py
+++ b/src/emitters/tests/test_area.py
@@ -22,7 +22,7 @@
 def create_emitter_and_spectrum(s_key='d65'):
     emitter = mi.load_dict({
         "type": "ply",
-        "filename": "data/triangle.ply",
+        "filename": "resources/data/tests/ply/triangle.ply",
         "emitter" : { "type": "area", "radiance" : spectrum_dicts[s_key] },
         "to_world" : mi.ScalarTransform4f.translate([10, -1, 2])
     })
diff --git a/src/emitters/tests/test_directionalarea.py b/src/emitters/tests/test_directionalarea.py
index 6dd75bc90..c838741e0 100644
--- a/src/emitters/tests/test_directionalarea.py
+++ b/src/emitters/tests/test_directionalarea.py
@@ -22,7 +22,7 @@
 def create_emitter_and_spectrum(s_key='d65'):
     emitter = mi.load_dict({
         "type": "ply",
-        "filename": "data/triangle.ply",
+        "filename": "resources/data/tests/ply/triangle.ply",
         "emitter" : { "type": "directionalarea", "radiance" : spectrum_dicts[s_key] },
         "to_world" : mi.ScalarTransform4f.translate([10, -1, 2])
     })
diff --git a/src/render/tests/data/triangle.ply b/src/render/tests/data/triangle.ply
deleted file mode 100644
index ad2c269ea..000000000
--- a/src/render/tests/data/triangle.ply
+++ /dev/null
@@ -1,14 +0,0 @@
-ply
-format ascii 1.0
-comment this file contains a triangle
-element vertex 3
-property float x
-property float y
-property float z
-element face 1
-property list uchar int vertex_index
-end_header
-0 0 0
-0 0 1
-0 1 0
-3 0 1 2
diff --git a/src/render/tests/data/triangle_face_colors.ply b/src/render/tests/data/triangle_face_colors.ply
deleted file mode 100644
index afe55668c..000000000
Binary files a/src/render/tests/data/triangle_face_colors.ply and /dev/null differ
diff --git a/src/render/tests/test_mesh.py b/src/render/tests/test_mesh.py
index bb4cb3506..1510c3a5e 100644
--- a/src/render/tests/test_mesh.py
+++ b/src/render/tests/test_mesh.py
@@ -34,7 +34,7 @@ def test01_create_mesh(variant_scalar_rgb):
 def test02_ply_triangle(variant_scalar_rgb):
     m = mi.load_dict({
         "type" : "ply",
-        "filename" : "data/triangle.ply",
+        "filename" : "resources/data/tests/ply/triangle.ply",
         "face_normals" : True
     })
 
@@ -59,7 +59,7 @@ def test03_ply_computed_normals(variant_scalar_rgb):
     doesn't have them."""
     shape = mi.load_dict({
         "type" : "ply",
-        "filename" : "data/triangle.ply",
+        "filename" : "resources/data/tests/ply/triangle.ply",
     })
     params = mi.traverse(shape)
     normals = params['vertex_normals']
@@ -168,7 +168,7 @@ def test():
 def test07_ply_stored_attribute(variant_scalar_rgb):
     m = mi.load_dict({
         "type" : "ply",
-        "filename" : "data/triangle_face_colors.ply",
+        "filename" : "resources/data/tests/ply/triangle_face_colors.ply",
     })
 
     assert str(m) == """PLYMesh[