diff --git a/examples/builder.c b/examples/builder.c
index 353cf5aa20..ff406b2654 100644
--- a/examples/builder.c
+++ b/examples/builder.c
@@ -49,7 +49,7 @@ main (int   argc,
   g_chdir (GTK_SRCDIR);
 #endif
 
-  GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 
   int status = g_application_run (G_APPLICATION (app), argc, argv);
diff --git a/examples/drawing.c b/examples/drawing.c
index 7a20bc1590..16b8bc8185 100644
--- a/examples/drawing.c
+++ b/examples/drawing.c
@@ -173,7 +173,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
diff --git a/examples/grid-packing.c b/examples/grid-packing.c
index b7d78b46e7..96e67a0f91 100644
--- a/examples/grid-packing.c
+++ b/examples/grid-packing.c
@@ -60,7 +60,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
diff --git a/examples/search-bar.c b/examples/search-bar.c
index 62f034e4b5..b4900434a2 100644
--- a/examples/search-bar.c
+++ b/examples/search-bar.c
@@ -37,10 +37,8 @@ main (int argc,
 {
   GtkApplication *app;
 
-  app = gtk_application_new ("org.gtk.Example.GtkSearchBar",
-      G_APPLICATION_FLAGS_NONE);
-  g_signal_connect (app, "activate",
-      G_CALLBACK (activate_cb), NULL);
+  app = gtk_application_new ("org.gtk.Example.GtkSearchBar", G_APPLICATION_DEFAULT_FLAGS);
+  g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
 
   return g_application_run (G_APPLICATION (app), argc, argv);
 }
diff --git a/examples/window-default.c b/examples/window-default.c
index 86ff66b4bc..66d7ba7fdf 100644
--- a/examples/window-default.c
+++ b/examples/window-default.c
@@ -19,7 +19,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
diff --git a/tests/testinfobar.c b/tests/testinfobar.c
index 6c5ac54d6d..cee11293a5 100644
--- a/tests/testinfobar.c
+++ b/tests/testinfobar.c
@@ -102,7 +102,7 @@ main (int   argc,
   int result;
 
   application = gtk_application_new ("org.gtk.test.infobar",
-                                     G_APPLICATION_FLAGS_NONE);
+                                     G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (application, "activate", G_CALLBACK (on_activate), NULL);
 
   result = g_application_run (G_APPLICATION (application), argc, argv);
diff --git a/tests/testlist4.c b/tests/testlist4.c
index 5e0263ab0b..e0b5cfc0e3 100644
--- a/tests/testlist4.c
+++ b/tests/testlist4.c
@@ -203,7 +203,7 @@ test_app_new (void)
 
   test_app = g_object_new (test_app_get_type (),
                            "application-id", "org.gtk.testlist4",
-                           "flags", G_APPLICATION_FLAGS_NONE,
+                           "flags", G_APPLICATION_DEFAULT_FLAGS,
                            NULL);
 
   return test_app;
diff --git a/tests/testmodelbutton.c b/tests/testmodelbutton.c
index 027e36a278..cb80f00e75 100644
--- a/tests/testmodelbutton.c
+++ b/tests/testmodelbutton.c
@@ -86,7 +86,7 @@ main (int   argc,
       char *argv[])
 {
   GtkApplication *application = gtk_application_new ("org.gtk.test.modelbutton",
-                                                     G_APPLICATION_FLAGS_NONE);
+                                                     G_APPLICATION_DEFAULT_FLAGS);
   int result;
 
   g_signal_connect (application, "activate",