diff --git a/meson.build b/meson.build
index 462ef3348..f34f752cb 100644
--- a/meson.build
+++ b/meson.build
@@ -124,16 +124,6 @@ test('files-in-git',
      args: [meson.current_source_dir()],
      suite: ['all'])
 
-# This is a generic pytest invocation. If we end up with more than one
-# pytest-compatible test somewhere, we'll conveniently run that one too.
-pytest = find_program('pytest-3', required: false)
-if pytest.found()
-	test('pytests', pytest,
-	     args: ['-vv', '--log-level=DEBUG'],
-	     workdir: meson.current_source_dir(),
-	     env: ['LIBWACOM_DATA_DIR=@0@'.format(dir_src_data)])
-endif
-
 ############### tools ###########################
 
 tools_cflags = ['-DDATABASEPATH="@0@"'.format(dir_src_data)]
diff --git a/test/test-tablet-svg-validity.c b/test/test-tablet-svg-validity.c
index 8b351b746..bb3b2d09d 100644
--- a/test/test-tablet-svg-validity.c
+++ b/test/test-tablet-svg-validity.c
@@ -69,7 +69,7 @@ class_found (gchar **classes, gchar *value)
 {
 	gchar **ptr = classes;
 	while (*ptr) {
-		if (strcmp (*ptr++, value) == 0)
+		if (g_str_equal (*ptr++, value))
 			return TRUE;
 	}
 
@@ -365,7 +365,7 @@ static void setup_tests(WacomDevice *device)
 	const char *name;
 
 	name = libwacom_get_name(device);
-	if (strcmp(name, "Generic") == 0)
+	if (g_str_equal(name, "Generic"))
 		return;
 
 	add_test(device, test_filename);
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
index 209508979..4b7983d56 100644
--- a/test/test-tablet-validity.c
+++ b/test/test-tablet-validity.c
@@ -327,7 +327,7 @@ static void setup_tests(WacomDevice *device)
 	WacomClass cls;
 
 	name = libwacom_get_name(device);
-	if (strcmp(name, "Generic") == 0)
+	if (g_str_equal(name, "Generic"))
 		return;
 
 	add_test(device, test_class);
diff --git a/tools/list-compatible-styli.c b/tools/list-compatible-styli.c
index 1233a20e9..0e2643cfe 100644
--- a/tools/list-compatible-styli.c
+++ b/tools/list-compatible-styli.c
@@ -32,6 +32,7 @@
 #include <assert.h>
 #include <libgen.h>
 #include <unistd.h>
+#include <glib.h>
 #include "libwacom.h"
 
 static void
@@ -72,7 +73,7 @@ int main(int argc, char **argv)
 	if (argc > 1) {
 		printf("Usage: %s [--help] - list compatible styli\n",
 		       basename(argv[0]));
-	       return !!(strcmp(argv[1], "--help"));
+	       return g_str_equal(argv[1], "--help");
 	}
 
 	db = libwacom_database_new_for_path(DATABASEPATH);