-EXTRA_DIST = $(srcdir)/ctf-traces/** tests
-if ENABLE_DEBUGINFO
-EXTRA_DIST += $(srcdir)/debuginfo-data/** tests_debuginfo
+EXTRA_DIST = $(srcdir)/ctf-traces/** \
+ $(srcdir)/debug-info-data/** \
+ $(srcdir)/debug-info-data/.build-id/cd/**
+
+TESTS_BINDINGS =
+
+if ENABLE_PYTHON_PLUGINS
+SUBDIRS += python-plugin-provider
+endif
+
+if ENABLE_PYTHON_BINDINGS
+TESTS_BINDINGS += bindings/python/bt2/test_python_bt2 \
+ bindings/python/babeltrace/test_python_babeltrace
+endif
+
+TESTS_CLI = \
+ cli/test_trace_read \
+ cli/test_packet_seq_num \
+ cli/test_convert_args \
+ cli/intersection/test_intersection \
+ cli/test_trace_copy \
+ cli/test_trimmer
+
+TESTS_LIB = \
+ lib/test_bitfield \
+ lib/test_ctf_writer_complete \
+ lib/test_bt_values \
+ lib/test_ctf_ir_ref \
+ lib/test_bt_ctf_field_type_validation \
+ lib/test_ir_visit \
+ lib/test_bt_notification_heap \
+ lib/test_graph_topo \
+ lib/test_cc_prio_map \
+ lib/test_bt_notification_iterator
+
+if !ENABLE_BUILT_IN_PLUGINS
+TESTS_LIB += lib/test_plugin_complete