diff --git a/test/gym_mode_1.png b/test/gym_mode_1.png
deleted file mode 100644
index f08a4de7..00000000
Binary files a/test/gym_mode_1.png and /dev/null differ
diff --git a/test/gym_mode_2.png b/test/gym_mode_2.png
deleted file mode 100644
index 032f38b5..00000000
Binary files a/test/gym_mode_2.png and /dev/null differ
diff --git a/test/gym_mode_3.png b/test/gym_mode_3.png
deleted file mode 100644
index e2222ed2..00000000
Binary files a/test/gym_mode_3.png and /dev/null differ
diff --git a/test/gym_mode_4.png b/test/gym_mode_4.png
deleted file mode 100644
index 54e92f61..00000000
Binary files a/test/gym_mode_4.png and /dev/null differ
diff --git a/test/gym_mode_5.png b/test/gym_mode_5.png
deleted file mode 100644
index b8b106b6..00000000
Binary files a/test/gym_mode_5.png and /dev/null differ
diff --git a/test/gym_mode_6.png b/test/gym_mode_6.png
deleted file mode 100644
index 94923431..00000000
Binary files a/test/gym_mode_6.png and /dev/null differ
diff --git a/test/gym_mode_7.png b/test/gym_mode_7.png
deleted file mode 100644
index cbee7e31..00000000
Binary files a/test/gym_mode_7.png and /dev/null differ
diff --git a/test/gym_mode_screen_test.dart b/test/gym_mode_screen_test.dart
index 668f8999..1b938642 100644
--- a/test/gym_mode_screen_test.dart
+++ b/test/gym_mode_screen_test.dart
@@ -80,8 +80,6 @@ void main() {
     expect(find.byIcon(Icons.chevron_left), findsNothing);
     expect(find.byIcon(Icons.exit_to_app), findsOneWidget);
     expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('gym_mode_1.png'));
-
     await tester.tap(find.byIcon(Icons.chevron_right));
     await tester.pumpAndSettle();
 
@@ -91,7 +89,6 @@ void main() {
     expect(find.byIcon(Icons.chevron_left), findsOneWidget);
     expect(find.byIcon(Icons.exit_to_app), findsOneWidget);
     expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('gym_mode_2.png'));
     await tester.drag(find.byType(ExerciseOverview), Offset(-500.0, 0.0));
     await tester.pumpAndSettle();
 
@@ -105,7 +102,6 @@ void main() {
     expect(find.byIcon(Icons.chevron_left), findsOneWidget);
     expect(find.byIcon(Icons.exit_to_app), findsOneWidget);
     expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('gym_mode_3.png'));
     await tester.drag(find.byType(LogPage), Offset(-500.0, 0.0));
     await tester.pumpAndSettle();
 
@@ -115,7 +111,6 @@ void main() {
     expect(find.byIcon(Icons.chevron_left), findsOneWidget);
     expect(find.byIcon(Icons.exit_to_app), findsOneWidget);
     expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('gym_mode_4.png'));
     await tester.tap(find.byIcon(Icons.chevron_right));
     await tester.pumpAndSettle();
 
@@ -123,7 +118,6 @@ void main() {
     expect(find.text('test exercise 1'), findsOneWidget);
     expect(find.byType(LogPage), findsOneWidget);
     expect(find.byType(Form), findsOneWidget);
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('gym_mode_5.png'));
     await tester.drag(find.byType(LogPage), Offset(-500.0, 0.0));
     await tester.pumpAndSettle();
 
@@ -133,7 +127,6 @@ void main() {
     expect(find.byIcon(Icons.chevron_left), findsOneWidget);
     expect(find.byIcon(Icons.exit_to_app), findsOneWidget);
     expect(find.byIcon(Icons.chevron_right), findsOneWidget);
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('gym_mode_6.png'));
     await tester.tap(find.byIcon(Icons.chevron_right));
     await tester.pumpAndSettle();
 
@@ -144,7 +137,6 @@ void main() {
     expect(find.byIcon(Icons.chevron_left), findsOneWidget);
     expect(find.byIcon(Icons.exit_to_app), findsOneWidget);
     expect(find.byIcon(Icons.chevron_right), findsNothing);
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('gym_mode_7.png'));
 
     //
   });
diff --git a/test/nutritional_meal_form.png b/test/nutritional_meal_form.png
deleted file mode 100644
index cdb8eb4d..00000000
Binary files a/test/nutritional_meal_form.png and /dev/null differ
diff --git a/test/nutritional_meal_form_test.dart b/test/nutritional_meal_form_test.dart
index c5c52aff..49d242a5 100644
--- a/test/nutritional_meal_form_test.dart
+++ b/test/nutritional_meal_form_test.dart
@@ -114,9 +114,4 @@ void main() {
     // Detail page
     // ...
   });
-
-  testWidgets('Golden test', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen(meal1));
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('nutritional_meal_form.png'));
-  });
 }
diff --git a/test/nutritional_plan_form.png b/test/nutritional_plan_form.png
deleted file mode 100644
index b660e918..00000000
Binary files a/test/nutritional_plan_form.png and /dev/null differ
diff --git a/test/nutritional_plan_form_test.dart b/test/nutritional_plan_form_test.dart
index 488c4f7f..a9aedd2d 100644
--- a/test/nutritional_plan_form_test.dart
+++ b/test/nutritional_plan_form_test.dart
@@ -118,9 +118,4 @@ void main() {
     await tester.pumpAndSettle();
     expect(find.text(('New cool plan')), findsOneWidget, reason: 'Nutritional plan detail page');
   });
-
-  testWidgets('Golden test', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen(plan1));
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('nutritional_plan_form.png'));
-  });
 }
diff --git a/test/nutritional_plan_screen.png b/test/nutritional_plan_screen.png
deleted file mode 100644
index 1ce518ee..00000000
Binary files a/test/nutritional_plan_screen.png and /dev/null differ
diff --git a/test/nutritional_plan_screen_test.dart b/test/nutritional_plan_screen_test.dart
index 1ab8ca7b..ecf04886 100644
--- a/test/nutritional_plan_screen_test.dart
+++ b/test/nutritional_plan_screen_test.dart
@@ -87,9 +87,4 @@ void main() {
 
     expect(find.text('17:00'), findsOneWidget);
   });
-
-  testWidgets('Golden test', (WidgetTester tester) async {
-    await tester.pumpWidget(createNutritionalPlan());
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('nutritional_plan_screen.png'));
-  });
 }
diff --git a/test/nutritional_plans_screen.png b/test/nutritional_plans_screen.png
deleted file mode 100644
index 09efe45d..00000000
Binary files a/test/nutritional_plans_screen.png and /dev/null differ
diff --git a/test/nutritional_plans_screen_test.dart b/test/nutritional_plans_screen_test.dart
index cb629b6e..fa7a235e 100644
--- a/test/nutritional_plans_screen_test.dart
+++ b/test/nutritional_plans_screen_test.dart
@@ -106,9 +106,4 @@ void main() {
     expect(find.text('1.1.2021'), findsOneWidget);
     expect(find.text('10.1.2021'), findsOneWidget);
   });
-
-  testWidgets('Golden test', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('nutritional_plans_screen.png'));
-  });
 }
diff --git a/test/weight_screen.png b/test/weight_screen.png
deleted file mode 100644
index c2836ee3..00000000
Binary files a/test/weight_screen.png and /dev/null differ
diff --git a/test/weight_screen_test.dart b/test/weight_screen_test.dart
index 96508919..17a4dcb9 100644
--- a/test/weight_screen_test.dart
+++ b/test/weight_screen_test.dart
@@ -107,9 +107,4 @@ void main() {
     expect(find.text('1.1.2021'), findsOneWidget);
     expect(find.text('10.1.2021'), findsOneWidget);
   });
-
-  testWidgets('Golden test', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('weight_screen.png'));
-  });
 }
diff --git a/test/workout_day_form.png b/test/workout_day_form.png
deleted file mode 100644
index ebf54740..00000000
Binary files a/test/workout_day_form.png and /dev/null differ
diff --git a/test/workout_day_form_test.dart b/test/workout_day_form_test.dart
index 28849f2b..8111f4e1 100644
--- a/test/workout_day_form_test.dart
+++ b/test/workout_day_form_test.dart
@@ -98,9 +98,4 @@ void main() {
     expect(find.text('Dienstag'), findsOneWidget);
     expect(find.text('Donnerstag'), findsOneWidget);
   });
-
-  testWidgets('Golden test', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('workout_day_form.png'));
-  });
 }
diff --git a/test/workout_form.png b/test/workout_form.png
deleted file mode 100644
index c10e696f..00000000
Binary files a/test/workout_form.png and /dev/null differ
diff --git a/test/workout_form_test.dart b/test/workout_form_test.dart
index 96d44277..92b89519 100644
--- a/test/workout_form_test.dart
+++ b/test/workout_form_test.dart
@@ -106,10 +106,4 @@ void main() {
     await tester.pumpAndSettle();
     expect(find.text(('New cool workout')), findsOneWidget, reason: 'Workout plan detail page');
   });
-
-  testWidgets('Golden test', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen(plan2));
-    await tester.pumpAndSettle();
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('workout_form.png'));
-  });
 }
diff --git a/test/workout_plan_screen.png b/test/workout_plan_screen.png
deleted file mode 100644
index 86edc8b6..00000000
Binary files a/test/workout_plan_screen.png and /dev/null differ
diff --git a/test/workout_plan_screen_test.dart b/test/workout_plan_screen_test.dart
index 2d6496d3..6ba411e9 100644
--- a/test/workout_plan_screen_test.dart
+++ b/test/workout_plan_screen_test.dart
@@ -83,12 +83,4 @@ void main() {
     expect(find.text('Montag, Dienstag'), findsOneWidget);
     expect(find.text('Donnerstag'), findsOneWidget);
   });
-
-  // flutter test --update-goldens
-  testWidgets('Golden test', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-    await tester.tap(find.byType(TextButton));
-    await tester.pumpAndSettle();
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('workout_plan_screen.png'));
-  });
 }
diff --git a/test/workout_plan_screens.png b/test/workout_plan_screens.png
deleted file mode 100644
index 935a6206..00000000
Binary files a/test/workout_plan_screens.png and /dev/null differ
diff --git a/test/workout_plans_screen_test.dart b/test/workout_plans_screen_test.dart
index 03af2df3..57facade 100644
--- a/test/workout_plans_screen_test.dart
+++ b/test/workout_plans_screen_test.dart
@@ -108,9 +108,4 @@ void main() {
     expect(find.text('1.1.2021'), findsOneWidget);
     expect(find.text('12.2.2021'), findsOneWidget);
   });
-
-  testWidgets('Golden test', (WidgetTester tester) async {
-    await tester.pumpWidget(createHomeScreen());
-    await expectLater(find.byType(MaterialApp), matchesGoldenFile('workout_plan_screens.png'));
-  });
 }