diff --git a/plugins/provider/tests/test-call.c b/plugins/provider/tests/test-call.c
index 7db2645..37890f3 100644
--- a/plugins/provider/tests/test-call.c
+++ b/plugins/provider/tests/test-call.c
@@ -10,7 +10,7 @@
 #include "calls-origin.h"
 #include "common.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 #include <string.h>
 
 static void
@@ -65,8 +65,7 @@ gint
 main (gint   argc,
       gchar *argv[])
 {
-  gtk_test_init (&argc, &argv, NULL);
-
+  g_test_init (&argc, &argv, NULL);
 
 #define add_test(name) add_calls_test(Call, call, name)
 
@@ -77,6 +76,5 @@ main (gint   argc,
 
 #undef add_test
 
-
   return g_test_run();
 }
diff --git a/plugins/provider/tests/test-media.c b/plugins/provider/tests/test-media.c
index 874d7df..44358a6 100644
--- a/plugins/provider/tests/test-media.c
+++ b/plugins/provider/tests/test-media.c
@@ -11,7 +11,7 @@
 #include "calls-srtp-utils.h"
 #include "gst-rfc3551.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 
 #include <gst/gst.h>
 
@@ -274,7 +274,7 @@ main (int   argc,
   CallsSipMediaManager *manager = calls_sip_media_manager_default ();
   int ret;
 
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
   gst_init (NULL, NULL);
 
diff --git a/plugins/provider/tests/test-origin.c b/plugins/provider/tests/test-origin.c
index 1c1271b..f24f52b 100644
--- a/plugins/provider/tests/test-origin.c
+++ b/plugins/provider/tests/test-origin.c
@@ -9,7 +9,7 @@
 #include "calls-origin.h"
 #include "common.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 #include <string.h>
 
 static void
@@ -79,8 +79,7 @@ gint
 main (gint   argc,
       gchar *argv[])
 {
-  gtk_test_init (&argc, &argv, NULL);
-
+  g_test_init (&argc, &argv, NULL);
 
 #define add_test(name) add_calls_test(Origin, origin, name)
 
@@ -90,6 +89,5 @@ main (gint   argc,
 
 #undef add_test
 
-
   return g_test_run();
 }
diff --git a/plugins/provider/tests/test-provider.c b/plugins/provider/tests/test-provider.c
index 16f3f56..9d961a5 100644
--- a/plugins/provider/tests/test-provider.c
+++ b/plugins/provider/tests/test-provider.c
@@ -10,7 +10,7 @@
 #include "calls-message-source.h"
 #include "common.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 #include <string.h>
 
 static void
@@ -53,8 +53,7 @@ gint
 main (gint   argc,
       gchar *argv[])
 {
-  gtk_test_init (&argc, &argv, NULL);
-
+  g_test_init (&argc, &argv, NULL);
 
 #define add_test(name) add_calls_test(Provider, provider, name)
 
@@ -64,6 +63,5 @@ main (gint   argc,
 
 #undef add_test
 
-
   return g_test_run();
 }
diff --git a/plugins/provider/tests/test-sdp-crypto.c b/plugins/provider/tests/test-sdp-crypto.c
index cab4336..040ba6f 100644
--- a/plugins/provider/tests/test-sdp-crypto.c
+++ b/plugins/provider/tests/test-sdp-crypto.c
@@ -8,7 +8,7 @@
 
 #include "calls-sdp-crypto-context.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 
 
 static void
@@ -173,7 +173,7 @@ int
 main (int   argc,
       char *argv[])
 {
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/Calls/SDP_crypto/manual", test_crypto_manual);
   g_test_add_func ("/Calls/SDP_crypto/offer_answer", test_crypto_offer_answer);
diff --git a/plugins/provider/tests/test-sip.c b/plugins/provider/tests/test-sip.c
index e40789a..185d372 100644
--- a/plugins/provider/tests/test-sip.c
+++ b/plugins/provider/tests/test-sip.c
@@ -14,10 +14,8 @@
 #include "calls-account.h"
 #include "gst-rfc3551.h"
 
-#include <gtk/gtk.h>
-
+#include <glib.h>
 #include <gst/gst.h>
-
 #include <sofia-sip/su_uniqueid.h>
 #include <libpeas/peas.h>
 
@@ -426,7 +424,7 @@ main (int   argc,
 {
   int ret;
 
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
   gst_init (NULL, NULL);
   /* this is a workaround for an issue with sofia: https://github.com/freeswitch/sofia-sip/issues/58 */
@@ -447,7 +445,7 @@ main (int   argc,
   g_test_add ("/Calls/SIP/calls_direct_call", SipFixture, NULL,
               setup_sip_origins, test_sip_call_direct_calls, tear_down_sip_origins);
 
-  ret = g_test_run();
+  ret = g_test_run ();
 
   gst_deinit ();
 
diff --git a/plugins/provider/tests/test-srtp.c b/plugins/provider/tests/test-srtp.c
index e8228b9..994b283 100644
--- a/plugins/provider/tests/test-srtp.c
+++ b/plugins/provider/tests/test-srtp.c
@@ -8,7 +8,7 @@
 
 #include "calls-srtp-utils.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 
 
 static void
@@ -473,7 +473,7 @@ int
 main (int   argc,
       char *argv[])
 {
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/Calls/SRTP-SDP/crypto_attribute_validity", test_crypto_attribute_validity);
   g_test_add_func ("/Calls/SRTP-SDP/parse", test_parse);
diff --git a/tests/test-application.c b/tests/test-application.c
index 92bd91c..30530be 100644
--- a/tests/test-application.c
+++ b/tests/test-application.c
@@ -9,7 +9,7 @@
 #include "calls-application.h"
 
 #include <glib/gstdio.h>
-#include <gtk/gtk.h>
+#include <glib.h>
 
 static gboolean
 on_idle_quit (gpointer user_data)
@@ -131,7 +131,7 @@ main (int   argc,
   g_print ("Setting 'CALLS_RECORD_DIR' to '%s'\n", rec_dir);
   g_setenv ("CALLS_RECORD_DIR", rec_dir, TRUE);
 
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/Calls/application/shutdown_daemon", (GTestFunc) test_application_shutdown_daemon);
   g_test_add_func ("/Calls/application/shutdown_no_daemon", (GTestFunc) test_application_shutdown_no_daemon);
diff --git a/tests/test-manager.c b/tests/test-manager.c
index e2b931e..f6e9d39 100644
--- a/tests/test-manager.c
+++ b/tests/test-manager.c
@@ -7,7 +7,7 @@
 #include "calls-manager.h"
 
 #include <cui-call.h>
-#include <gtk/gtk.h>
+#include <glib.h>
 
 struct TestData {
   GMainLoop *loop;
@@ -250,12 +250,12 @@ gint
 main (gint   argc,
       gchar *argv[])
 {
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
-  g_test_add_func("/Calls/Manager/without_provider", test_calls_manager_without_provider);
-  g_test_add_func("/Calls/Manager/dummy_provider", test_calls_manager_dummy_provider);
-  g_test_add_func("/Calls/Manager/mm_provider", test_calls_manager_mm_provider);
-  g_test_add_func("/Calls/Manager/multiple_provider_mm_sip", test_calls_manager_multiple_providers_mm_sip);
+  g_test_add_func ("/Calls/Manager/without_provider", test_calls_manager_without_provider);
+  g_test_add_func ("/Calls/Manager/dummy_provider", test_calls_manager_dummy_provider);
+  g_test_add_func ("/Calls/Manager/mm_provider", test_calls_manager_mm_provider);
+  g_test_add_func ("/Calls/Manager/multiple_provider_mm_sip", test_calls_manager_multiple_providers_mm_sip);
 
-  return g_test_run();
+  return g_test_run ();
 }
diff --git a/tests/test-plugins.c b/tests/test-plugins.c
index 33fcb8a..9adaa10 100644
--- a/tests/test-plugins.c
+++ b/tests/test-plugins.c
@@ -10,7 +10,7 @@
 
 #include "calls-provider.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 #include <libpeas/peas.h>
 
 static void
@@ -52,7 +52,7 @@ main (gint   argc,
   const gchar *dir;
   g_autofree char *default_plugin_dir_provider = NULL;
 
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
   peas = peas_engine_get_default ();
 
diff --git a/tests/test-settings.c b/tests/test-settings.c
index 4934d01..ef338a2 100644
--- a/tests/test-settings.c
+++ b/tests/test-settings.c
@@ -9,7 +9,8 @@
 #define G_SETTINGS_ENABLE_BACKEND
 #include <gio/gsettingsbackend.h>
 
-#include <gtk/gtk.h>
+#include <glib.h>
+#include <gio/gio.h>
 
 static void
 test_default (void)
@@ -32,7 +33,7 @@ int
 main (gint   argc,
       gchar *argv[])
 {
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/Calls/Settings/default", test_default);
 
diff --git a/tests/test-ui-call.c b/tests/test-ui-call.c
index 5cd84c1..1a30e6b 100644
--- a/tests/test-ui-call.c
+++ b/tests/test-ui-call.c
@@ -10,7 +10,7 @@
 #include "calls-ui-call-data.h"
 #include "mock-call.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 
 static void
 test_cui_call_state_mapping (void)
@@ -80,7 +80,7 @@ int
 main (int   argc,
       char *argv[])
 {
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/Calls/UI/state_mapping", (GTestFunc) test_cui_call_state_mapping);
   g_test_add_func ("/Calls/UI/call_properties", (GTestFunc) test_cui_call_properties);
diff --git a/tests/test-util.c b/tests/test-util.c
index aa268c0..5851ac3 100644
--- a/tests/test-util.c
+++ b/tests/test-util.c
@@ -8,7 +8,7 @@
 
 #include "calls-util.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 
 #include <sys/socket.h>
 
@@ -97,7 +97,7 @@ int
 main (int   argc,
       char *argv[])
 {
-  gtk_test_init (&argc, &argv, NULL);
+  g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/Calls/util/protocol_prefix", (GTestFunc) test_protocol_prefix);
   g_test_add_func ("/Calls/util/dtmf_tones", (GTestFunc) test_dtmf_tone_validity);