diff --git a/configure b/configure
index c7db22ce966..47a82bdf6c5 100755
--- a/configure
+++ b/configure
@@ -25379,6 +25379,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvfw32/Makefile: dlls/msvfw32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msvfw32/Makefile"
 
+ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/msvfw32/tests/Makefile"
+test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	msvfw32/tests"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/msvfw32/tests/Makefile: dlls/msvfw32/tests/Makefile.in dlls/Maketest.rules"
+ac_config_files="$ac_config_files dlls/msvfw32/tests/Makefile"
+
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvidc32/Makefile"
 test "x$enable_msvidc32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
@@ -28083,6 +28091,7 @@ do
     "dlls/msvcrtd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrtd/Makefile" ;;
     "dlls/msvcrtd/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrtd/tests/Makefile" ;;
     "dlls/msvfw32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvfw32/Makefile" ;;
+    "dlls/msvfw32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvfw32/tests/Makefile" ;;
     "dlls/msvidc32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvidc32/Makefile" ;;
     "dlls/mswsock/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mswsock/Makefile" ;;
     "dlls/msxml3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msxml3/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index b5542017730..4bf1ec38401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1929,6 +1929,7 @@ WINE_CONFIG_MAKEFILE([dlls/msvcrt40/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D
 WINE_CONFIG_MAKEFILE([dlls/msvcrtd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/msvcrtd/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/msvfw32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvfw32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/msvidc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/mswsock/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/msxml3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/msvfw32/tests/Makefile.in b/dlls/msvfw32/tests/Makefile.in
new file mode 100644
index 00000000000..feb67c62fa4
--- /dev/null
+++ b/dlls/msvfw32/tests/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = msvfw32.dll
+IMPORTS   = msvfw32 kernel32
+
+CTESTS = \
+	msvfw.c
+
+@MAKE_TEST_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c
new file mode 100644
index 00000000000..ce3a90806ba
--- /dev/null
+++ b/dlls/msvfw32/tests/msvfw.c
@@ -0,0 +1,59 @@
+/*
+ * Unit tests for video playback
+ *
+ * Copyright 2008 Jörg Höhle
+ * Copyright 2008 Austin English
+ *
+ * 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
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <vfw.h>
+
+#include "wine/test.h"
+
+static void test_OpenCase(void)
+{
+    HIC h;
+    /* ICOpen(fcc: vidc , handler: cvid) */
+    /* ICTYPE_VIDEO is vidc: lowercase */
+    /* Officially registered fcc for Cinepak is CVID: uppercase */
+    h = ICOpen(mmioFOURCC('v','i','d','c'),mmioFOURCC('c','v','i','d'),ICMODE_DECOMPRESS);
+    ok(0!=h,"ICOpen(vidc.cvid) failed\n");
+    if (h) {
+        ok(ICClose(h)==ICERR_OK,"ICClose failed\n");
+    }
+    h = ICOpen(mmioFOURCC('v','i','d','c'),mmioFOURCC('C','V','I','D'),ICMODE_DECOMPRESS);
+    ok(0!=h,"ICOpen(vidc.CVID) failed\n");
+    if (h) {
+        ok(ICClose(h)==ICERR_OK,"ICClose failed\n");
+    }
+    h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('c','v','i','d'),ICMODE_DECOMPRESS);
+    todo_wine ok(0!=h,"ICOpen(VIDC.cvid) failed\n");
+    if (h) {
+        ok(ICClose(h)==ICERR_OK,"ICClose failed\n");
+    }
+    h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('C','V','I','D'),ICMODE_DECOMPRESS);
+    todo_wine ok(0!=h,"ICOpen(VIDC.CVID) failed\n");
+    if (h) {
+        ok(ICClose(h)==ICERR_OK,"ICClose failed\n");
+    }
+}
+
+START_TEST(msvfw)
+{
+    test_OpenCase();
+}