diff --git a/tests/proptest/Android.mk b/tests/proptest/Android.mk
new file mode 100644
index 00000000..d0ab5c92
--- /dev/null
+++ b/tests/proptest/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/Makefile.sources
+
+LOCAL_SRC_FILES := $(PROPTEST_FILES)
+
+LOCAL_MODULE := proptest
+
+LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_STATIC_LIBRARIES := libdrm_util
+
+include $(BUILD_EXECUTABLE)
diff --git a/tests/proptest/Makefile.am b/tests/proptest/Makefile.am
index 14288206..3fde46be 100644
--- a/tests/proptest/Makefile.am
+++ b/tests/proptest/Makefile.am
@@ -1,3 +1,5 @@
+include Makefile.sources
+
 AM_CFLAGS = \
 	$(WARN_CFLAGS)\
 	-I$(top_srcdir)/include/drm \
@@ -12,8 +14,8 @@ noinst_PROGRAMS = \
 	proptest
 endif
 
-proptest_SOURCES = \
-	proptest.c
+proptest_SOURCES = $(PROPTEST_FILES)
+
 proptest_LDADD = \
 	$(top_builddir)/libdrm.la \
 	$(top_builddir)/tests/util/libutil.la
diff --git a/tests/proptest/Makefile.sources b/tests/proptest/Makefile.sources
new file mode 100644
index 00000000..446110d6
--- /dev/null
+++ b/tests/proptest/Makefile.sources
@@ -0,0 +1,2 @@
+PROPTEST_FILES := \
+	proptest.c