diff --git a/tests/test-basic.c b/tests/test-basic.c
index 5a3993c..607f7a8 100644
--- a/tests/test-basic.c
+++ b/tests/test-basic.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-basic.c Unit test: basics
  *
diff --git a/tests/test-default-action.c b/tests/test-default-action.c
index 871f9d8..fe9c131 100644
--- a/tests/test-default-action.c
+++ b/tests/test-default-action.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-default-action.c Unit test: default action
  *
diff --git a/tests/test-error.c b/tests/test-error.c
index 0ceff32..3370416 100644
--- a/tests/test-error.c
+++ b/tests/test-error.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-default-action.c Unit test: error handling
  *
diff --git a/tests/test-image.c b/tests/test-image.c
index bee0a93..9580cce 100644
--- a/tests/test-image.c
+++ b/tests/test-image.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-image.c Unit test: images
  *
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
         file = g_get_current_dir ();
         uri = g_strdup_printf ("file://%s/%s",
                                file,
-                               "applet-critical.png");
+                               "dewdop_leaf.jpg");
 
         g_free (file);
         printf ("sending %s\n", uri);
diff --git a/tests/test-markup.c b/tests/test-markup.c
index 3050506..ccfd6aa 100644
--- a/tests/test-markup.c
+++ b/tests/test-markup.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-markup.c Unit test: markup
  *
diff --git a/tests/test-multi-actions.c b/tests/test-multi-actions.c
index 8c3908b..7e70ed6 100644
--- a/tests/test-multi-actions.c
+++ b/tests/test-multi-actions.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-multi-actions.c Unit test: multiple actions
  *
diff --git a/tests/test-replace-widget.c b/tests/test-replace-widget.c
index 06bacfd..3c03ccc 100644
--- a/tests/test-replace-widget.c
+++ b/tests/test-replace-widget.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tests/test-replace.c b/tests/test-replace.c
index af299ca..bf3f980 100644
--- a/tests/test-replace.c
+++ b/tests/test-replace.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tests/test-server-info.c b/tests/test-server-info.c
index 276d58a..30f6bca 100644
--- a/tests/test-server-info.c
+++ b/tests/test-server-info.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-server-info.c Retrieves the server info and caps
  *
diff --git a/tests/test-size-changes.c b/tests/test-size-changes.c
index f8c50f7..fd6460b 100644
--- a/tests/test-size-changes.c
+++ b/tests/test-size-changes.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-size-changes.c Unit test: Notification size changes
  *
diff --git a/tests/test-urgency.c b/tests/test-urgency.c
index ba12039..1b2de5a 100644
--- a/tests/test-urgency.c
+++ b/tests/test-urgency.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-urgency.c Unit test: urgency levels
  *
diff --git a/tests/test-xy-actions.c b/tests/test-xy-actions.c
index 1534b42..a6b9008 100644
--- a/tests/test-xy-actions.c
+++ b/tests/test-xy-actions.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-xy-actions.c Unit test: X, Y hints and actions
  *
diff --git a/tests/test-xy-stress.c b/tests/test-xy-stress.c
index d24cb6d..a306f7b 100644
--- a/tests/test-xy-stress.c
+++ b/tests/test-xy-stress.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-xy.c Unit test: X, Y hints
  *
diff --git a/tests/test-xy.c b/tests/test-xy.c
index 17023f0..ad4891c 100644
--- a/tests/test-xy.c
+++ b/tests/test-xy.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * @file tests/test-xy.c Unit test: X, Y hints
  *