diff --git a/raster3d/r3.out.vtk/test.r3.out.vtk.sh b/raster3d/r3.out.vtk/testsuite/test_r3_out_vtk.sh
similarity index 87%
rename from raster3d/r3.out.vtk/test.r3.out.vtk.sh
rename to raster3d/r3.out.vtk/testsuite/test_r3_out_vtk.sh
index b931d504537..d2eb43a21e1 100755
--- a/raster3d/r3.out.vtk/test.r3.out.vtk.sh
+++ b/raster3d/r3.out.vtk/testsuite/test_r3_out_vtk.sh
@@ -23,19 +23,19 @@ r3.mapcalc --o expr="volume_rgb = volume_null * 5"
 # The first @test just exports the volume map as cell and point data
 # using alow precision and replaces the default null value with 0
 # the created @files should be compared with the reference data.
-r3.out.vtk --o input=volume_null output=test_volume_null_1_cells.vtk dp=3 null=0
-r3.out.vtk -p --o input=volume_null output=test_volume_null_1_points.vtk dp=3 null=0
+r3.out.vtk --o input=volume_null output=test_volume_null_1_cells.vtk precision=3 null=0
+r3.out.vtk -p --o input=volume_null output=test_volume_null_1_points.vtk precision=3 null=0
 
 # The second @test adds rgb and vector maps. We re-use the created volume map
 # for vector creation. The rgb value must range fom 0 - 255. The generated @files
 # should be compared with the reference data.
-r3.out.vtk --o rgbmaps=volume_rgb,volume_rgb,volume_rgb vectormaps=volume_null,volume_null,volume_null input=volume_null output=test_volume_null_1_cells_rgb_vect.vtk dp=3 null=-1.0
-r3.out.vtk -p --o rgbmaps=volume_rgb,volume_rgb,volume_rgb vectormaps=volume_null,volume_null,volume_null input=volume_null output=test_volume_null_1_points_rgb_vect.vtk dp=3 null=-1.0
+r3.out.vtk --o rgbmaps=volume_rgb,volume_rgb,volume_rgb vectormaps=volume_null,volume_null,volume_null input=volume_null output=test_volume_null_1_cells_rgb_vect.vtk precision=3 null=-1.0
+r3.out.vtk -p --o rgbmaps=volume_rgb,volume_rgb,volume_rgb vectormaps=volume_null,volume_null,volume_null input=volume_null output=test_volume_null_1_points_rgb_vect.vtk precision=3 null=-1.0
 
 # The third @test uses raster maps to create volume data with an elevation surface
 # The maximum elevation should be in the south. Reference @files are present for validation.
-r3.out.vtk -s --o top=elev_top bottom=elev_bottom input=volume_null output=test_volume_null_1_cells_elevation.vtk dp=3 null=0
-r3.out.vtk -sp --o top=elev_top bottom=elev_bottom input=volume_null output=test_volume_null_1_points_elevation.vtk dp=3 null=0
+r3.out.vtk -s --o top=elev_top bottom=elev_bottom input=volume_null output=test_volume_null_1_cells_elevation.vtk precision=3 null=0
+r3.out.vtk -sp --o top=elev_top bottom=elev_bottom input=volume_null output=test_volume_null_1_points_elevation.vtk precision=3 null=0
 
 # Comparison of references and vtk files
 for i in `ls *.ref` ; do
diff --git a/raster3d/r3.out.vtk/test_volume_null_1_cells.ref b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_cells.ref
similarity index 99%
rename from raster3d/r3.out.vtk/test_volume_null_1_cells.ref
rename to raster3d/r3.out.vtk/testsuite/test_volume_null_1_cells.ref
index 815133ecac2..704e5724367 100644
--- a/raster3d/r3.out.vtk/test_volume_null_1_cells.ref
+++ b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_cells.ref
@@ -1,5 +1,5 @@
 # vtk DataFile Version 3.0
-GRASS GIS Export
+GRASS GIS 8 Export
 ASCII
 DATASET STRUCTURED_POINTS
 DIMENSIONS 13 9 6
diff --git a/raster3d/r3.out.vtk/test_volume_null_1_cells_elevation.ref b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_cells_elevation.ref
similarity index 99%
rename from raster3d/r3.out.vtk/test_volume_null_1_cells_elevation.ref
rename to raster3d/r3.out.vtk/testsuite/test_volume_null_1_cells_elevation.ref
index a60329adb72..910db14526c 100644
--- a/raster3d/r3.out.vtk/test_volume_null_1_cells_elevation.ref
+++ b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_cells_elevation.ref
@@ -1,5 +1,5 @@
 # vtk DataFile Version 3.0
-GRASS GIS Export
+GRASS GIS 8 Export
 ASCII
 DATASET UNSTRUCTURED_GRID
 POINTS 3840 float
diff --git a/raster3d/r3.out.vtk/test_volume_null_1_cells_rgb_vect.ref b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_cells_rgb_vect.ref
similarity index 99%
rename from raster3d/r3.out.vtk/test_volume_null_1_cells_rgb_vect.ref
rename to raster3d/r3.out.vtk/testsuite/test_volume_null_1_cells_rgb_vect.ref
index b60c1e46734..b4671f754ab 100644
--- a/raster3d/r3.out.vtk/test_volume_null_1_cells_rgb_vect.ref
+++ b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_cells_rgb_vect.ref
@@ -1,5 +1,5 @@
 # vtk DataFile Version 3.0
-GRASS GIS Export
+GRASS GIS 8 Export
 ASCII
 DATASET STRUCTURED_POINTS
 DIMENSIONS 13 9 6
diff --git a/raster3d/r3.out.vtk/test_volume_null_1_points.ref b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_points.ref
similarity index 99%
rename from raster3d/r3.out.vtk/test_volume_null_1_points.ref
rename to raster3d/r3.out.vtk/testsuite/test_volume_null_1_points.ref
index a22cb713cc9..0fb505bed30 100644
--- a/raster3d/r3.out.vtk/test_volume_null_1_points.ref
+++ b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_points.ref
@@ -1,5 +1,5 @@
 # vtk DataFile Version 3.0
-GRASS GIS Export
+GRASS GIS 8 Export
 ASCII
 DATASET STRUCTURED_POINTS
 DIMENSIONS 12 8 5
diff --git a/raster3d/r3.out.vtk/test_volume_null_1_points_elevation.ref b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_points_elevation.ref
similarity index 99%
rename from raster3d/r3.out.vtk/test_volume_null_1_points_elevation.ref
rename to raster3d/r3.out.vtk/testsuite/test_volume_null_1_points_elevation.ref
index 41bd29af486..dda3ca74922 100644
--- a/raster3d/r3.out.vtk/test_volume_null_1_points_elevation.ref
+++ b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_points_elevation.ref
@@ -1,5 +1,5 @@
 # vtk DataFile Version 3.0
-GRASS GIS Export
+GRASS GIS 8 Export
 ASCII
 DATASET STRUCTURED_GRID
 DIMENSIONS 12 8 5
diff --git a/raster3d/r3.out.vtk/test_volume_null_1_points_rgb_vect.ref b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_points_rgb_vect.ref
similarity index 99%
rename from raster3d/r3.out.vtk/test_volume_null_1_points_rgb_vect.ref
rename to raster3d/r3.out.vtk/testsuite/test_volume_null_1_points_rgb_vect.ref
index 2612ce6ce37..42aeda30ceb 100644
--- a/raster3d/r3.out.vtk/test_volume_null_1_points_rgb_vect.ref
+++ b/raster3d/r3.out.vtk/testsuite/test_volume_null_1_points_rgb_vect.ref
@@ -1,5 +1,5 @@
 # vtk DataFile Version 3.0
-GRASS GIS Export
+GRASS GIS 8 Export
 ASCII
 DATASET STRUCTURED_POINTS
 DIMENSIONS 12 8 5