diff --git a/.gitignore b/.gitignore
index c33da3f1b63..b442c453c8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,6 +187,9 @@ dlls/imm.dll16
 dlls/imm32/libimm32.def
 dlls/imm32/version.res
 dlls/inetcomm/libinetcomm.def
+dlls/inetcomm/tests/*.ok
+dlls/inetcomm/tests/inetcomm_crosstest.exe
+dlls/inetcomm/tests/testlist.c
 dlls/infosoft/tests/*.ok
 dlls/infosoft/tests/infosoft_crosstest.exe
 dlls/infosoft/tests/testlist.c
@@ -719,6 +722,7 @@ programs/winetest/dsound_test.exe
 programs/winetest/gdi32_test.exe
 programs/winetest/gdiplus_test.exe
 programs/winetest/hlink_test.exe
+programs/winetest/inetcomm_test.exe
 programs/winetest/infosoft_test.exe
 programs/winetest/iphlpapi_test.exe
 programs/winetest/itss_test.exe
diff --git a/Makefile.in b/Makefile.in
index 640142a30b0..69120bed358 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -258,6 +258,7 @@ ALL_MAKEFILES = \
 	dlls/imagehlp/Makefile \
 	dlls/imm32/Makefile \
 	dlls/inetcomm/Makefile \
+	dlls/inetcomm/tests/Makefile \
 	dlls/infosoft/Makefile \
 	dlls/infosoft/tests/Makefile \
 	dlls/inkobj/Makefile \
@@ -637,6 +638,7 @@ dlls/imaadp32.acm/Makefile: dlls/imaadp32.acm/Makefile.in dlls/Makedll.rules
 dlls/imagehlp/Makefile: dlls/imagehlp/Makefile.in dlls/Makedll.rules
 dlls/imm32/Makefile: dlls/imm32/Makefile.in dlls/Makedll.rules
 dlls/inetcomm/Makefile: dlls/inetcomm/Makefile.in dlls/Makedll.rules
+dlls/inetcomm/tests/Makefile: dlls/inetcomm/tests/Makefile.in dlls/Maketest.rules
 dlls/infosoft/Makefile: dlls/infosoft/Makefile.in dlls/Makedll.rules
 dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules
 dlls/inkobj/Makefile: dlls/inkobj/Makefile.in dlls/Makedll.rules
diff --git a/configure b/configure
index 8b14068f8a6..1fc3fa7a585 100755
--- a/configure
+++ b/configure
@@ -20714,6 +20714,8 @@ ac_config_files="$ac_config_files dlls/imm32/Makefile"
 
 ac_config_files="$ac_config_files dlls/inetcomm/Makefile"
 
+ac_config_files="$ac_config_files dlls/inetcomm/tests/Makefile"
+
 ac_config_files="$ac_config_files dlls/infosoft/Makefile"
 
 ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile"
@@ -21908,6 +21910,7 @@ do
     "dlls/imagehlp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imagehlp/Makefile" ;;
     "dlls/imm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/Makefile" ;;
     "dlls/inetcomm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/Makefile" ;;
+    "dlls/inetcomm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/tests/Makefile" ;;
     "dlls/infosoft/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/Makefile" ;;
     "dlls/infosoft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/tests/Makefile" ;;
     "dlls/inkobj/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inkobj/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index cccb9b68f96..aa900921083 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1674,6 +1674,7 @@ AC_CONFIG_FILES([dlls/imaadp32.acm/Makefile])
 AC_CONFIG_FILES([dlls/imagehlp/Makefile])
 AC_CONFIG_FILES([dlls/imm32/Makefile])
 AC_CONFIG_FILES([dlls/inetcomm/Makefile])
+AC_CONFIG_FILES([dlls/inetcomm/tests/Makefile])
 AC_CONFIG_FILES([dlls/infosoft/Makefile])
 AC_CONFIG_FILES([dlls/infosoft/tests/Makefile])
 AC_CONFIG_FILES([dlls/inkobj/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 932d44956a4..0d2f3e4e8c7 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -269,6 +269,7 @@ TESTSUBDIRS = \
 	gdi32/tests \
 	gdiplus/tests \
 	hlink/tests \
+	inetcomm/tests \
 	infosoft/tests \
 	iphlpapi/tests \
 	itss/tests \
diff --git a/dlls/inetcomm/tests/Makefile.in b/dlls/inetcomm/tests/Makefile.in
new file mode 100644
index 00000000000..93e8b3bf1f4
--- /dev/null
+++ b/dlls/inetcomm/tests/Makefile.in
@@ -0,0 +1,14 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = inetcomm.dll
+IMPORTS   = inetcomm ole32 kernel32
+EXTRALIBS =
+
+CTESTS = \
+	mimeole.c
+
+@MAKE_TEST_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c
new file mode 100644
index 00000000000..d1281931796
--- /dev/null
+++ b/dlls/inetcomm/tests/mimeole.c
@@ -0,0 +1,49 @@
+/*
+ * MimeOle tests
+ *
+ * Copyright 2007 Huw Davies
+ *
+ * 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 COBJMACROS
+
+#include "windows.h"
+#include "ole2.h"
+#include "mimeole.h"
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "wine/test.h"
+
+
+static void test_CreateVirtualStream(void)
+{
+    HRESULT hr;
+    IStream *pstm;
+
+    hr = MimeOleCreateVirtualStream(&pstm);
+    ok(hr == S_OK, "ret %08x\n", hr);
+
+    IStream_Release(pstm);
+}
+
+START_TEST(mimeole)
+{
+    OleInitialize(NULL);
+    test_CreateVirtualStream();
+    OleUninitialize();
+}
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 2d4b12b0724..2cc17d1c71b 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -42,6 +42,7 @@ TESTBINS = \
 	gdi32_test.exe \
 	gdiplus_test.exe \
 	hlink_test.exe \
+	inetcomm_test.exe \
 	infosoft_test.exe \
 	iphlpapi_test.exe \
 	itss_test.exe \
@@ -137,6 +138,8 @@ gdiplus_test.exe: $(DLLDIR)/gdiplus/tests/gdiplus_test.exe$(DLLEXT)
 	cp $(DLLDIR)/gdiplus/tests/gdiplus_test.exe$(DLLEXT) $@ && $(STRIP) $@
 hlink_test.exe: $(DLLDIR)/hlink/tests/hlink_test.exe$(DLLEXT)
 	cp $(DLLDIR)/hlink/tests/hlink_test.exe$(DLLEXT) $@ && $(STRIP) $@
+inetcomm_test.exe: $(DLLDIR)/inetcomm/tests/inetcomm_test.exe$(DLLEXT)
+	cp $(DLLDIR)/inetcomm/tests/inetcomm_test.exe$(DLLEXT) $@ && $(STRIP) $@
 infosoft_test.exe: $(DLLDIR)/infosoft/tests/infosoft_test.exe$(DLLEXT)
 	cp $(DLLDIR)/infosoft/tests/infosoft_test.exe$(DLLEXT) $@ && $(STRIP) $@
 iphlpapi_test.exe: $(DLLDIR)/iphlpapi/tests/iphlpapi_test.exe$(DLLEXT)
diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc
index de1f7e9579d..58ae0626e5b 100644
--- a/programs/winetest/winetest.rc
+++ b/programs/winetest/winetest.rc
@@ -100,6 +100,7 @@ dsound_test.exe TESTRES "dsound_test.exe"
 gdi32_test.exe TESTRES "gdi32_test.exe"
 gdiplus_test.exe TESTRES "gdiplus_test.exe"
 hlink_test.exe TESTRES "hlink_test.exe"
+inetcomm_test.exe TESTRES "inetcomm_test.exe"
 infosoft_test.exe TESTRES "infosoft_test.exe"
 iphlpapi_test.exe TESTRES "iphlpapi_test.exe"
 itss_test.exe TESTRES "itss_test.exe"