diff --git a/.gitignore b/.gitignore
index d4b76bb209f..807044ce6d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -389,6 +389,9 @@ dlls/psapi/tests/*.ok
 dlls/psapi/tests/psapi_crosstest.exe
 dlls/psapi/tests/testlist.c
 dlls/qcap/version.res
+dlls/qedit/tests/*.ok
+dlls/qedit/tests/qedit_crosstest.exe
+dlls/qedit/tests/testlist.c
 dlls/qmgr/qmgr_local.h
 dlls/qmgr/qmgr_local_i.c
 dlls/qmgrprxy/qmgrprxy.h
@@ -775,6 +778,7 @@ programs/winetest/oleaut32_test.exe
 programs/winetest/opengl32_test.exe
 programs/winetest/pdh_test.exe
 programs/winetest/psapi_test.exe
+programs/winetest/qedit_test.exe
 programs/winetest/quartz_test.exe
 programs/winetest/riched20_test.exe
 programs/winetest/riched32_test.exe
diff --git a/Makefile.in b/Makefile.in
index b6efebeb641..6347f93aa0d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -381,6 +381,7 @@ ALL_MAKEFILES = \
 	dlls/pstorec/Makefile \
 	dlls/qcap/Makefile \
 	dlls/qedit/Makefile \
+	dlls/qedit/tests/Makefile \
 	dlls/qmgr/Makefile \
 	dlls/qmgrprxy/Makefile \
 	dlls/quartz/Makefile \
@@ -793,6 +794,7 @@ dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules
 dlls/pstorec/Makefile: dlls/pstorec/Makefile.in dlls/Makedll.rules
 dlls/qcap/Makefile: dlls/qcap/Makefile.in dlls/Makedll.rules
 dlls/qedit/Makefile: dlls/qedit/Makefile.in dlls/Makedll.rules
+dlls/qedit/tests/Makefile: dlls/qedit/tests/Makefile.in dlls/Maketest.rules
 dlls/qmgr/Makefile: dlls/qmgr/Makefile.in dlls/Makedll.rules
 dlls/qmgrprxy/Makefile: dlls/qmgrprxy/Makefile.in dlls/Makedll.rules
 dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules
diff --git a/configure b/configure
index 9ae32d317c3..3d81b67ad37 100755
--- a/configure
+++ b/configure
@@ -21613,6 +21613,8 @@ ac_config_files="$ac_config_files dlls/qcap/Makefile"
 
 ac_config_files="$ac_config_files dlls/qedit/Makefile"
 
+ac_config_files="$ac_config_files dlls/qedit/tests/Makefile"
+
 ac_config_files="$ac_config_files dlls/qmgr/Makefile"
 
 ac_config_files="$ac_config_files dlls/qmgrprxy/Makefile"
@@ -22750,6 +22752,7 @@ do
     "dlls/pstorec/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pstorec/Makefile" ;;
     "dlls/qcap/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qcap/Makefile" ;;
     "dlls/qedit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qedit/Makefile" ;;
+    "dlls/qedit/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qedit/tests/Makefile" ;;
     "dlls/qmgr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/Makefile" ;;
     "dlls/qmgrprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgrprxy/Makefile" ;;
     "dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index e2ba38e6c55..12720883761 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1880,6 +1880,7 @@ AC_CONFIG_FILES([dlls/psapi/tests/Makefile])
 AC_CONFIG_FILES([dlls/pstorec/Makefile])
 AC_CONFIG_FILES([dlls/qcap/Makefile])
 AC_CONFIG_FILES([dlls/qedit/Makefile])
+AC_CONFIG_FILES([dlls/qedit/tests/Makefile])
 AC_CONFIG_FILES([dlls/qmgr/Makefile])
 AC_CONFIG_FILES([dlls/qmgrprxy/Makefile])
 AC_CONFIG_FILES([dlls/quartz/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 4be93236ec0..643ab549033 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -326,6 +326,7 @@ TESTSUBDIRS = \
 	opengl32/tests \
 	pdh/tests \
 	psapi/tests \
+	qedit/tests \
 	quartz/tests \
 	riched20/tests \
 	riched32/tests \
diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in
new file mode 100644
index 00000000000..523697555e6
--- /dev/null
+++ b/dlls/qedit/tests/Makefile.in
@@ -0,0 +1,14 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = qedit.dll
+IMPORTS   = ole32 kernel32
+EXTRALIBS = -lstrmiids -luuid
+
+CTESTS = \
+	mediadet.c
+
+@MAKE_TEST_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c
new file mode 100644
index 00000000000..35a569e344f
--- /dev/null
+++ b/dlls/qedit/tests/mediadet.c
@@ -0,0 +1,45 @@
+/*
+ * Unit tests for Media Detector
+ *
+ * Copyright (C) 2008 Google (Lei Zhang)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <assert.h>
+
+#define COBJMACROS
+
+#include "wine/test.h"
+#include "qedit.h"
+
+static void test_mediadet(void)
+{
+    HRESULT hr;
+    IMediaDet *pM = NULL;
+
+    hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER,
+            &IID_IMediaDet, (LPVOID*)&pM);
+    todo_wine {
+    ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr);
+    ok(pM != NULL, "pM is NULL\n");
+    }
+}
+
+START_TEST(mediadet)
+{
+    CoInitialize(NULL);
+    test_mediadet();
+}
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 02448ab8adf..c3f6715a0d8 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -70,6 +70,7 @@ TESTBINS = \
 	opengl32_test.exe \
 	pdh_test.exe \
 	psapi_test.exe \
+	qedit_test.exe \
 	quartz_test.exe \
 	riched20_test.exe \
 	riched32_test.exe \
@@ -196,6 +197,8 @@ pdh_test.exe: $(DLLDIR)/pdh/tests/pdh_test.exe$(DLLEXT)
 	cp $(DLLDIR)/pdh/tests/pdh_test.exe$(DLLEXT) $@ && $(STRIP) $@
 psapi_test.exe: $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT)
 	cp $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT) $@ && $(STRIP) $@
+qedit_test.exe: $(DLLDIR)/qedit/tests/qedit_test.exe$(DLLEXT)
+	cp $(DLLDIR)/qedit/tests/qedit_test.exe$(DLLEXT) $@ && $(STRIP) $@
 quartz_test.exe: $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT)
 	cp $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) $@ && $(STRIP) $@
 riched20_test.exe: $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT)
diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc
index 7f155d804ee..0bcb21433ad 100644
--- a/programs/winetest/winetest.rc
+++ b/programs/winetest/winetest.rc
@@ -128,6 +128,7 @@ oleaut32_test.exe TESTRES "oleaut32_test.exe"
 opengl32_test.exe TESTRES "opengl32_test.exe"
 pdh_test.exe TESTRES "pdh_test.exe"
 psapi_test.exe TESTRES "psapi_test.exe"
+qedit_test.exe TESTRES "qedit_test.exe"
 quartz_test.exe TESTRES "quartz_test.exe"
 riched20_test.exe TESTRES "riched20_test.exe"
 riched32_test.exe TESTRES "riched32_test.exe"