diff --git a/rostests/apitests/fltlib/CMakeLists.txt b/rostests/apitests/fltlib/CMakeLists.txt
new file mode 100644
index 00000000000..db7d1ae55be
--- /dev/null
+++ b/rostests/apitests/fltlib/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+list(APPEND SOURCE
+    load.c
+    handles.c
+    instance.c
+	instance_find.c
+	filter_find.c
+	volume_find.c
+	info.c
+	comms.c
+    testlist.c)
+
+add_executable(fltlib_apitest ${SOURCE})
+set_module_type(fltlib_apitest win32cui)
+add_importlibs(fltlib_apitest user32 msvcrt kernel32)
+add_cd_file(TARGET fltlib_apitest DESTINATION reactos/bin FOR all)
diff --git a/rostests/apitests/fltlib/comms.c b/rostests/apitests/fltlib/comms.c
new file mode 100644
index 00000000000..e39ba4d06ef
--- /dev/null
+++ b/rostests/apitests/fltlib/comms.c
@@ -0,0 +1,45 @@
+/*
+* FltLib related functions tests
+*
+* Copyright 2016 Ged Murphy (ged.murphy@reactos.org)
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public Licence as
+* published by the Free Software Foundation; either version 2 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
+* General Public License for more details.
+*
+* You should have received a copy of the GNU 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 <apitest.h>
+#include <stdio.h>
+#include <assert.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winsvc.h>
+
+//
+// Tests for:
+//      FilterConnectCommunicationPort
+//      FilterSendMessage
+//      FilterGetMessage
+//      FilterReplyMessage
+//
+
+static void test_FIXME(void)
+{
+
+}
+
+
+START_TEST(comms)
+{
+    test_FIXME();
+}
diff --git a/rostests/apitests/fltlib/filter_find.c b/rostests/apitests/fltlib/filter_find.c
new file mode 100644
index 00000000000..e1f23dc8351
--- /dev/null
+++ b/rostests/apitests/fltlib/filter_find.c
@@ -0,0 +1,47 @@
+/*
+* FltLib related functions tests
+*
+* Copyright 2016 Ged Murphy (ged.murphy@reactos.org)
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public Licence as
+* published by the Free Software Foundation; either version 2 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
+* General Public License for more details.
+*
+* You should have received a copy of the GNU 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 <apitest.h>
+#include <stdio.h>
+#include <assert.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winsvc.h>
+
+//
+// Tests for:
+//      FilterFindFirst
+//      FilterFindNext
+//      FilterFindClose
+//      FilterVolumeFindFirst
+//      FilterVolumeFindNext
+//      FilterVolumeFindClose
+//
+
+static void test_FIXME(void)
+{
+
+}
+
+
+START_TEST(filter_find)
+{
+    test_FIXME();
+}
diff --git a/rostests/apitests/fltlib/handles.c b/rostests/apitests/fltlib/handles.c
new file mode 100644
index 00000000000..6db352234a1
--- /dev/null
+++ b/rostests/apitests/fltlib/handles.c
@@ -0,0 +1,45 @@
+/*
+* FltLib related functions tests
+*
+* Copyright 2016 Ged Murphy (ged.murphy@reactos.org)
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public Licence as
+* published by the Free Software Foundation; either version 2 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
+* General Public License for more details.
+*
+* You should have received a copy of the GNU 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 <apitest.h>
+#include <stdio.h>
+#include <assert.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winsvc.h>
+
+//
+// Tests for:
+//      FilterCreate
+//      FilterClose
+//      FilterInstanceCreate
+//      FilterInstanceClose
+//
+
+static void test_FIXME(void)
+{
+
+}
+
+
+START_TEST(handles)
+{
+    test_FIXME();
+}
diff --git a/rostests/apitests/fltlib/info.c b/rostests/apitests/fltlib/info.c
new file mode 100644
index 00000000000..299605af872
--- /dev/null
+++ b/rostests/apitests/fltlib/info.c
@@ -0,0 +1,44 @@
+/*
+* FltLib related functions tests
+*
+* Copyright 2016 Ged Murphy (ged.murphy@reactos.org)
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public Licence as
+* published by the Free Software Foundation; either version 2 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
+* General Public License for more details.
+*
+* You should have received a copy of the GNU 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 <apitest.h>
+#include <stdio.h>
+#include <assert.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winsvc.h>
+
+//
+// Tests for:
+//      FilterGetInformation
+//      FilterInstanceGetInformation
+//      FilterGetDosName
+//
+
+static void test_FIXME(void)
+{
+
+}
+
+
+START_TEST(info)
+{
+    test_FIXME();
+}
diff --git a/rostests/apitests/fltlib/instance.c b/rostests/apitests/fltlib/instance.c
new file mode 100644
index 00000000000..6e47ead32dc
--- /dev/null
+++ b/rostests/apitests/fltlib/instance.c
@@ -0,0 +1,44 @@
+/*
+* FltLib related functions tests
+*
+* Copyright 2016 Ged Murphy (ged.murphy@reactos.org)
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public Licence as
+* published by the Free Software Foundation; either version 2 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
+* General Public License for more details.
+*
+* You should have received a copy of the GNU 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 <apitest.h>
+#include <stdio.h>
+#include <assert.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winsvc.h>
+
+//
+// Tests for:
+//      FilterAttach
+//      FilterAttachAtAltitude
+//      FilterDetach
+//
+
+static void test_FIXME(void)
+{
+
+}
+
+
+START_TEST(instance)
+{
+    test_FIXME();
+}
diff --git a/rostests/apitests/fltlib/instance_find.c b/rostests/apitests/fltlib/instance_find.c
new file mode 100644
index 00000000000..fd7aba7af0b
--- /dev/null
+++ b/rostests/apitests/fltlib/instance_find.c
@@ -0,0 +1,44 @@
+/*
+* FltLib related functions tests
+*
+* Copyright 2016 Ged Murphy (ged.murphy@reactos.org)
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public Licence as
+* published by the Free Software Foundation; either version 2 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
+* General Public License for more details.
+*
+* You should have received a copy of the GNU 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 <apitest.h>
+#include <stdio.h>
+#include <assert.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winsvc.h>
+
+//
+// Tests for:
+//      FilterInstanceFindFirst
+//      FilterInstanceFindNext
+//      FilterInstanceFindClose
+//
+
+static void test_FIXME(void)
+{
+
+}
+
+
+START_TEST(instance_find)
+{
+    test_FIXME();
+}
diff --git a/rostests/apitests/fltlib/load.c b/rostests/apitests/fltlib/load.c
new file mode 100644
index 00000000000..5c294ca87e9
--- /dev/null
+++ b/rostests/apitests/fltlib/load.c
@@ -0,0 +1,44 @@
+/*
+* FltLib related functions tests
+*
+* Copyright 2016 Ged Murphy (ged.murphy@reactos.org)
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public Licence as
+* published by the Free Software Foundation; either version 2 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
+* General Public License for more details.
+*
+* You should have received a copy of the GNU 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 <apitest.h>
+#include <stdio.h>
+#include <assert.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winsvc.h>
+
+//
+// Tests for:
+//      FilterLoad
+//      FilterUnload
+//
+
+
+static void test_FIXME(void)
+{
+
+}
+
+
+START_TEST(load)
+{
+    test_FIXME();
+}
diff --git a/rostests/apitests/fltlib/testlist.c b/rostests/apitests/fltlib/testlist.c
new file mode 100644
index 00000000000..b9f855d710c
--- /dev/null
+++ b/rostests/apitests/fltlib/testlist.c
@@ -0,0 +1,26 @@
+#define __ROS_LONG64__
+
+#define STANDALONE
+#include <apitest.h>
+
+extern void func_load(void);
+extern void func_handles(void);
+extern void func_instance(void);
+extern void func_instance_find(void);
+extern void func_filter_find(void);
+extern void func_volume_find(void);
+extern void func_info(void);
+extern void func_comms(void);
+
+const struct test winetest_testlist[] =
+{
+    { "load", func_load },
+    { "handles", func_handles},
+    { "instance", func_instance },
+    { "instance_find", func_instance_find },
+    { "filter_find", func_filter_find },
+    { "volume_find", func_volume_find },
+    { "info", func_info },
+    { "comms", func_comms },
+    { 0, 0 }
+};
diff --git a/rostests/apitests/fltlib/volume_find.c b/rostests/apitests/fltlib/volume_find.c
new file mode 100644
index 00000000000..e2759edd2cd
--- /dev/null
+++ b/rostests/apitests/fltlib/volume_find.c
@@ -0,0 +1,44 @@
+/*
+* FltLib related functions tests
+*
+* Copyright 2016 Ged Murphy (ged.murphy@reactos.org)
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public Licence as
+* published by the Free Software Foundation; either version 2 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
+* General Public License for more details.
+*
+* You should have received a copy of the GNU 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 <apitest.h>
+#include <stdio.h>
+#include <assert.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winsvc.h>
+
+//
+// Tests for:
+//      FilterVolumeInstanceFindFirst
+//      FilterVolumeInstanceFindNext
+//      FilterVolumeInstanceFindClose
+//
+
+static void test_FIXME(void)
+{
+
+}
+
+
+START_TEST(volume_find)
+{
+    test_FIXME();
+}