diff --git a/controllers/administration.js b/controllers/administration.js
index 36f50e2fcf..8594ab4e7f 100644
--- a/controllers/administration.js
+++ b/controllers/administration.js
@@ -1617,7 +1617,8 @@ const renderClassEdit = (req, res, next) => {
 						class: currentClass,
 						gradeLevels,
 						isCustom,
-						referrer: '/administration/classes/',
+						referrer: Configuration.get('FEATURE_SHOW_NEW_CLASS_VIEW_ENABLED')
+							? '/administration/groups/classes/' : '/administration/classes/',
 					});
 				},
 			);
@@ -1848,7 +1849,8 @@ router.get(
 						students: filterStudents(res, students),
 						schoolUsesLdap: res.locals.currentSchoolData.ldapSchoolIdentifier,
 						notes,
-						referrer: '/administration/classes/',
+						referrer: Configuration.get('FEATURE_SHOW_NEW_CLASS_VIEW_ENABLED')
+							? '/administration/groups/classes/' : '/administration/classes/',
 						consentsMissing: usersWithoutConsent.length !== 0,
 						consentNecessary,
 						// eslint-disable-next-line max-len
diff --git a/views/administration/dashboard.hbs b/views/administration/dashboard.hbs
index ee9cd93571..b1500eb561 100644
--- a/views/administration/dashboard.hbs
+++ b/views/administration/dashboard.hbs
@@ -61,7 +61,7 @@
                             {{#userHasPermission 'CLASS_LIST'}}
                                 {{#if (getConfig "FEATURE_SHOW_NEW_CLASS_VIEW_ENABLED")}}
                                     <div class="col-md-6 col-sm-6 col-xs-12">
-                                        <div class="card h-100 teacher-option locationlink" data-loclink="/administration/groups/classes" data-testid="administrate_classes">
+                                        <div class="card h-100 teacher-option locationlink" data-loclink="/administration/groups/classes" data-testid="administrate_classes_new">
                                             <div class="card-block homework">
                                                 <div class="card-text">
                                                     <h2 class="h4"><i class="fa fa-users"></i> {{$t "administration.dashboard.headline.manageClassesNew" }}</h2>
diff --git a/views/administration/forms/form-classes-manage.hbs b/views/administration/forms/form-classes-manage.hbs
index b905237523..4164d306e1 100644
--- a/views/administration/forms/form-classes-manage.hbs
+++ b/views/administration/forms/form-classes-manage.hbs
@@ -48,7 +48,7 @@
 
     <div class="modal-footer mt-1">
         <a class="btn btn-secondary btn-cancel">{{$t "global.button.cancel" }}</a>
-        <button type="submit" class="btn btn-primary">{{$t "global.button.saveChanges" }}</button>
+        <button data-testid="manage-confirm" type="submit" class="btn btn-primary">{{$t "global.button.saveChanges" }}</button>
     </div>
 
     <hr class="my-2"/>