8 files changed, 14 insertions, 15 deletions
diff --git a/testsuite/gtk/accessible.c b/testsuite/gtk/accessible.c
index cdf3253730..7f5a034b94 100644
--- a/testsuite/gtk/accessible.c
+++ b/testsuite/gtk/accessible.c
@@ -24,7 +24,7 @@ main (int argc, char *argv[])
   const GType *tp;
   guint i, n;
 
-  gtk_init (&argc, &argv);
+  gtk_init ();
 
   tp = gtk_test_list_all_types (&n);
 
diff --git a/testsuite/gtk/cssprovider.c b/testsuite/gtk/cssprovider.c
index 0272c6b9fd..3c3fbff765 100644
--- a/testsuite/gtk/cssprovider.c
+++ b/testsuite/gtk/cssprovider.c
@@ -65,7 +65,7 @@ test_section_load_nonexisting_file (void)
 int
 main (int argc, char *argv[])
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/cssprovider/section-in-load-from-data", test_section_in_load_from_data);
diff --git a/testsuite/gtk/displayclose.c b/testsuite/gtk/displayclose.c
index 39fd794e92..60f90f8f49 100644
--- a/testsuite/gtk/displayclose.c
+++ b/testsuite/gtk/displayclose.c
@@ -6,14 +6,17 @@ main (int argc, char **argv)
   const gchar *display_name;
   GdkDisplay *display;
   GtkWidget *win, *but;
+  gboolean has_display;
 
   g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
 
-  if (!gtk_parse_args (&argc, &argv))
-    return 1;
+  gdk_set_allowed_backends ("x11");
+  display_name = g_getenv ("DISPLAY");
+  g_unsetenv ("DISPLAY");
+  has_display = gtk_init_check ();
+  g_assert (!has_display);
 
-  display_name = gdk_get_display_arg_name();
-  display = gdk_display_open(display_name);
+  display = gdk_display_open (display_name);
 
   if (!display)
     return 1;
diff --git a/testsuite/gtk/firefox-stylecontext.c b/testsuite/gtk/firefox-stylecontext.c
index 86dc1ee5f0..f02cb3aaf5 100644
--- a/testsuite/gtk/firefox-stylecontext.c
+++ b/testsuite/gtk/firefox-stylecontext.c
@@ -53,11 +53,7 @@ test_init_of_theme (void)
 int
 main (int argc, char *argv[])
 {
-  /* If gdk_init() is called before gtk_init() the GTK code takes
-   * a different path (why?)
-   */
-  gdk_init (NULL, NULL);
-  gtk_init (NULL, NULL);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/style/init_of_theme", test_init_of_theme);
diff --git a/testsuite/gtk/gtkmenu.c b/testsuite/gtk/gtkmenu.c
index e2667ba135..c17d50aa75 100644
--- a/testsuite/gtk/gtkmenu.c
+++ b/testsuite/gtk/gtkmenu.c
@@ -422,7 +422,7 @@ test_bind_menu (void)
   GRand *rand;
   gint i;
 
-  gtk_init (0, 0);
+  gtk_init ();
 
   rand = g_rand_new_with_seed (g_test_rand_int ());
   model = random_menu_new (rand, TOP_ORDER);
diff --git a/testsuite/gtk/revealer-size.c b/testsuite/gtk/revealer-size.c
index 8c09a49125..cc1708ab67 100644
--- a/testsuite/gtk/revealer-size.c
+++ b/testsuite/gtk/revealer-size.c
@@ -128,7 +128,7 @@ slide_up_no_animations ()
 int
 main (int argc, char **argv)
 {
-  gtk_init (&argc, &argv);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/sizing/revealer/slide_right_animations", slide_right_animations);
diff --git a/testsuite/gtk/scrolledwindow.c b/testsuite/gtk/scrolledwindow.c
index b62b32393d..f960c38339 100644
--- a/testsuite/gtk/scrolledwindow.c
+++ b/testsuite/gtk/scrolledwindow.c
@@ -125,7 +125,7 @@ min_max_content_height (void)
 int
 main (int argc, char **argv)
 {
-  gtk_init (&argc, &argv);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/sizing/scrolledwindow/min_content_width", min_content_width);
diff --git a/testsuite/gtk/stylecontext.c b/testsuite/gtk/stylecontext.c
index 57a8dd53c6..b66d91739b 100644
--- a/testsuite/gtk/stylecontext.c
+++ b/testsuite/gtk/stylecontext.c
@@ -508,7 +508,7 @@ test_style_priorities_three_context_higher (PrioritiesFixture *f,
 int
 main (int argc, char *argv[])
 {
-  gtk_init (NULL, NULL);
+  gtk_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/style/parse/selectors", test_parse_selectors);