diff --git a/tests/data_out/data_out_08.cc b/tests/data_out/data_out_08.cc
index 597cbeab3dc3..d7d0be3ec68a 100644
--- a/tests/data_out/data_out_08.cc
+++ b/tests/data_out/data_out_08.cc
@@ -86,8 +86,8 @@ class FilteredDataOut : public DataOut<dim>
         const IteratorFilters::SubdomainEqualTo predicate(subdomain_id);
 
         return ++(
-          FilteredIterator<typename DataOut<dim>::cell_iterator>(predicate,
-                                                                 old_cell));
+          FilteredIterator<typename Triangulation<dim>::active_cell_iterator>(
+            predicate, old_cell));
       }
     else
       return old_cell;
diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc
index e708e5cf6641..18053718a51c 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_04.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc
@@ -67,8 +67,7 @@ class FilteredDataOut : public DataOut<dim>
   virtual typename DataOut<dim>::cell_iterator
   first_cell()
   {
-    typename DataOut<dim>::active_cell_iterator cell =
-      this->triangulation->begin_active();
+    auto cell = this->triangulation->begin_active();
     while ((cell != this->triangulation->end()) &&
            (cell->subdomain_id() != subdomain_id))
       ++cell;
@@ -83,8 +82,9 @@ class FilteredDataOut : public DataOut<dim>
       {
         const IteratorFilters::SubdomainEqualTo predicate(subdomain_id);
 
-        return ++(FilteredIterator<typename DataOut<dim>::active_cell_iterator>(
-          predicate, old_cell));
+        return ++(
+          FilteredIterator<typename Triangulation<dim>::active_cell_iterator>(
+            predicate, old_cell));
       }
     else
       return old_cell;
diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc
index 0e206e2f03bb..59dff0a4bf21 100644
--- a/tests/mpi/p4est_3d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc
@@ -67,8 +67,7 @@ class FilteredDataOut : public DataOut<dim>
   virtual typename DataOut<dim>::cell_iterator
   first_cell()
   {
-    typename DataOut<dim>::active_cell_iterator cell =
-      this->triangulation->begin_active();
+    auto cell = this->triangulation->begin_active();
     while ((cell != this->triangulation->end()) &&
            (cell->subdomain_id() != subdomain_id))
       ++cell;
@@ -83,8 +82,9 @@ class FilteredDataOut : public DataOut<dim>
       {
         const IteratorFilters::SubdomainEqualTo predicate(subdomain_id);
 
-        return ++(FilteredIterator<typename DataOut<dim>::active_cell_iterator>(
-          predicate, old_cell));
+        return ++(
+          FilteredIterator<typename Triangulation<dim>::active_cell_iterator>(
+            predicate, old_cell));
       }
     else
       return old_cell;