diff --git a/test/hyperbolic/CMakeLists.txt b/test/hyperbolic/CMakeLists.txt
index 3a2fd470cc9f207f89eceae9d54d6186bd91afbe..53148a9ed8881e9252bd687222c91795ceab14fd 100644
--- a/test/hyperbolic/CMakeLists.txt
+++ b/test/hyperbolic/CMakeLists.txt
@@ -1,6 +1,6 @@
-dune_add_formcompiler_system_test(UFLFILE lineartransport_dg.ufl
-                                  BASENAME lineartransport_dg
-                                  INIFILE lineartransport_dg.mini
+dune_add_formcompiler_system_test(UFLFILE lineartransport.ufl
+                                  BASENAME lineartransport
+                                  INIFILE lineartransport.mini
                                   )
 
 dune_add_formcompiler_system_test(UFLFILE linearacoustics.ufl
diff --git a/test/hyperbolic/lineartransport_dg.mini b/test/hyperbolic/lineartransport.mini
similarity index 93%
rename from test/hyperbolic/lineartransport_dg.mini
rename to test/hyperbolic/lineartransport.mini
index 3032193bab9061b3b73748957d91659572156bae..be1a17c4887ea3938aa03983b4582e90c91cfda1 100644
--- a/test/hyperbolic/lineartransport_dg.mini
+++ b/test/hyperbolic/lineartransport.mini
@@ -1,4 +1,4 @@
-__name = lineartransport_dg_{__exec_suffix}
+__name = lineartransport_{__exec_suffix}
 __exec_suffix = {diff_suffix}_{scheme_suffix}
 
 diff_suffix = numdiff, symdiff | expand diff
diff --git a/test/hyperbolic/lineartransport_dg.ufl b/test/hyperbolic/lineartransport.ufl
similarity index 100%
rename from test/hyperbolic/lineartransport_dg.ufl
rename to test/hyperbolic/lineartransport.ufl
diff --git a/test/sumfact/hyperbolic/CMakeLists.txt b/test/sumfact/hyperbolic/CMakeLists.txt
index 34cee3a0af91728be6bd5498440db73d44da5e08..8399811dfe665e2b7d096c4d2ab6800a07bce657 100644
--- a/test/sumfact/hyperbolic/CMakeLists.txt
+++ b/test/sumfact/hyperbolic/CMakeLists.txt
@@ -1,4 +1,4 @@
-dune_add_formcompiler_system_test(UFLFILE lineartransport_dg.ufl
-                                  BASENAME sumfact_lineartransport_dg
-                                  INIFILE lineartransport_dg.mini
+dune_add_formcompiler_system_test(UFLFILE lineartransport.ufl
+                                  BASENAME sumfact_lineartransport
+                                  INIFILE lineartransport.mini
                                   )
diff --git a/test/sumfact/hyperbolic/lineartransport_dg.mini b/test/sumfact/hyperbolic/lineartransport.mini
similarity index 92%
rename from test/sumfact/hyperbolic/lineartransport_dg.mini
rename to test/sumfact/hyperbolic/lineartransport.mini
index 731c169d73899651e8308ed95a7d234c6b1f0d78..81738269883a365c36ae49de9be810cf2cf882cd 100644
--- a/test/sumfact/hyperbolic/lineartransport_dg.mini
+++ b/test/sumfact/hyperbolic/lineartransport.mini
@@ -1,4 +1,4 @@
-__name = sumfact_lineartransport_dg
+__name = sumfact_lineartransport
 
 extension = 1.0 1.0
 cells = 20 20
diff --git a/test/sumfact/hyperbolic/lineartransport_dg.ufl b/test/sumfact/hyperbolic/lineartransport.ufl
similarity index 100%
rename from test/sumfact/hyperbolic/lineartransport_dg.ufl
rename to test/sumfact/hyperbolic/lineartransport.ufl