diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8c96b510..5c6bc0fd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,6 +20,7 @@ TESTS_progs_M = \
 	gem_flink \
 	gem_gtt_concurrent_blit \
 	gem_mmap_gtt \
+	gem_partial_pwrite_pread \
 	flip_test \
 	$(NULL)
 
@@ -47,7 +48,6 @@ TESTS_progs = \
 	gem_tiled_pread_pwrite \
 	gem_tiled_partial_pwrite_pread \
 	gem_tiled_swapping \
-	gem_partial_pwrite_pread \
 	gem_linear_blits \
 	gem_vmap_blits \
 	gem_threaded_access_tiled \
diff --git a/tests/gem_partial_pwrite_pread.c b/tests/gem_partial_pwrite_pread.c
index 81fcdf5d..f6fbdbff 100644
--- a/tests/gem_partial_pwrite_pread.c
+++ b/tests/gem_partial_pwrite_pread.c
@@ -257,6 +257,8 @@ int main(int argc, char **argv)
 {
 	srandom(0xdeadbeef);
 
+	drmtest_subtest_init(argc, argv);
+
 	fd = drm_open_any();
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
@@ -271,11 +273,14 @@ int main(int argc, char **argv)
 	drmtest_init_aperture_trashers(bufmgr);
 	mappable_gtt_limit = gem_mappable_aperture_size();
 
-	test_partial_reads();
+	if (drmtest_run_subtest("reads"))
+		test_partial_reads();
 
-	test_partial_writes();
+	if (drmtest_run_subtest("writes"))
+		test_partial_writes();
 
-	test_partial_read_writes();
+	if (drmtest_run_subtest("writes-after-reads"))
+		test_partial_read_writes();
 
 	drmtest_cleanup_aperture_trashers();
 	drm_intel_bufmgr_destroy(bufmgr);