diff --git a/tests/Makefile.am b/tests/Makefile.am
index 68cdd53f7647547e5fe18fec851833acb196f54c..f53e2083716452ca486c019516f42ead9ada4506 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -108,6 +108,7 @@ test_programs = virshtest sockettest \
 	sysinfotest \
 	virstoragetest \
         fdstreamtest \
+        fchosttest \
 	$(NULL)
 
 if WITH_GNUTLS
@@ -715,6 +716,10 @@ fdstreamtest_SOURCES = \
 	fdstreamtest.c testutils.h testutils.c
 fdstreamtest_LDADD = $(LDADDS)
 
+fchosttest_SOURCES = \
+       fchosttest.c testutils.h testutils.c
+fchosttest_LDADD = $(LDADDS)
+
 if WITH_CIL
 CILOPTFLAGS =
 CILOPTINCS =
diff --git a/tests/fchostdata/fc_host/host4/fabric_name b/tests/fchostdata/fc_host/host4/fabric_name
new file mode 100644
index 0000000000000000000000000000000000000000..f587b683a49db1829f4e38624b183659297aabb2
--- /dev/null
+++ b/tests/fchostdata/fc_host/host4/fabric_name
@@ -0,0 +1 @@
+0xffffffffffffffff
diff --git a/tests/fchostdata/fc_host/host4/max_npiv_vports b/tests/fchostdata/fc_host/host4/max_npiv_vports
new file mode 100644
index 0000000000000000000000000000000000000000..c75acbe2ff1053360e76c0ff6012517cbd1dec9b
--- /dev/null
+++ b/tests/fchostdata/fc_host/host4/max_npiv_vports
@@ -0,0 +1 @@
+127
diff --git a/tests/fchostdata/fc_host/host4/node_name b/tests/fchostdata/fc_host/host4/node_name
new file mode 100644
index 0000000000000000000000000000000000000000..e8c1e1ad231c3388b0ad650b5af80e510d738c5e
--- /dev/null
+++ b/tests/fchostdata/fc_host/host4/node_name
@@ -0,0 +1 @@
+0x2000001b3289da4e
diff --git a/tests/fchostdata/fc_host/host4/npiv_vports_inuse b/tests/fchostdata/fc_host/host4/npiv_vports_inuse
new file mode 100644
index 0000000000000000000000000000000000000000..573541ac9702dd3969c9bc859d2b91ec1f7e6e56
--- /dev/null
+++ b/tests/fchostdata/fc_host/host4/npiv_vports_inuse
@@ -0,0 +1 @@
+0
diff --git a/tests/fchostdata/fc_host/host4/port_name b/tests/fchostdata/fc_host/host4/port_name
new file mode 100644
index 0000000000000000000000000000000000000000..ee2d399dcb40e9506ab5aca7385bd4534c3d508b
--- /dev/null
+++ b/tests/fchostdata/fc_host/host4/port_name
@@ -0,0 +1 @@
+0x2100001b3289da4e
diff --git a/tests/fchostdata/fc_host/host4/port_state b/tests/fchostdata/fc_host/host4/port_state
new file mode 100644
index 0000000000000000000000000000000000000000..bd1e6d51802a3bf56af1930fb60bc76a6aee6905
--- /dev/null
+++ b/tests/fchostdata/fc_host/host4/port_state
@@ -0,0 +1 @@
+Linkdown
diff --git a/tests/fchostdata/fc_host/host4/vport_create b/tests/fchostdata/fc_host/host4/vport_create
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/fchostdata/fc_host/host4/vport_delete b/tests/fchostdata/fc_host/host4/vport_delete
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/fchostdata/fc_host/host5/fabric_name b/tests/fchostdata/fc_host/host5/fabric_name
new file mode 100644
index 0000000000000000000000000000000000000000..4128070a5c25dfd5c93743ef8320a4704ed510cf
--- /dev/null
+++ b/tests/fchostdata/fc_host/host5/fabric_name
@@ -0,0 +1 @@
+0x2001000dec9877c1
diff --git a/tests/fchostdata/fc_host/host5/max_npiv_vports b/tests/fchostdata/fc_host/host5/max_npiv_vports
new file mode 100644
index 0000000000000000000000000000000000000000..c75acbe2ff1053360e76c0ff6012517cbd1dec9b
--- /dev/null
+++ b/tests/fchostdata/fc_host/host5/max_npiv_vports
@@ -0,0 +1 @@
+127
diff --git a/tests/fchostdata/fc_host/host5/node_name b/tests/fchostdata/fc_host/host5/node_name
new file mode 100644
index 0000000000000000000000000000000000000000..91a0a05c1f1c1eda1e3f298030c215cbb8fa1a00
--- /dev/null
+++ b/tests/fchostdata/fc_host/host5/node_name
@@ -0,0 +1 @@
+0x2001001b32a9da4e
diff --git a/tests/fchostdata/fc_host/host5/npiv_vports_inuse b/tests/fchostdata/fc_host/host5/npiv_vports_inuse
new file mode 100644
index 0000000000000000000000000000000000000000..573541ac9702dd3969c9bc859d2b91ec1f7e6e56
--- /dev/null
+++ b/tests/fchostdata/fc_host/host5/npiv_vports_inuse
@@ -0,0 +1 @@
+0
diff --git a/tests/fchostdata/fc_host/host5/port_name b/tests/fchostdata/fc_host/host5/port_name
new file mode 100644
index 0000000000000000000000000000000000000000..c37f618e843b040d3f1b0d154ebf50174f73b128
--- /dev/null
+++ b/tests/fchostdata/fc_host/host5/port_name
@@ -0,0 +1 @@
+0x2101001b32a9da4e
diff --git a/tests/fchostdata/fc_host/host5/port_state b/tests/fchostdata/fc_host/host5/port_state
new file mode 100644
index 0000000000000000000000000000000000000000..b73dd4613e66e8205501de06fc202df135ed3fc9
--- /dev/null
+++ b/tests/fchostdata/fc_host/host5/port_state
@@ -0,0 +1 @@
+Online
diff --git a/tests/fchostdata/fc_host/host5/vport_create b/tests/fchostdata/fc_host/host5/vport_create
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/fchostdata/fc_host/host5/vport_delete b/tests/fchostdata/fc_host/host5/vport_delete
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/fchosttest.c b/tests/fchosttest.c
new file mode 100644
index 0000000000000000000000000000000000000000..035f72110e9869abef86387e848981bc87f467de
--- /dev/null
+++ b/tests/fchosttest.c
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * 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, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <config.h>
+
+#include "virutil.h"
+#include "testutils.h"
+
+#define TEST_FC_HOST_PREFIX "./fchostdata/fc_host/"
+#define TEST_FC_HOST_NUM 5
+
+/* Test virIsCapableFCHost */
+static int
+test1(const void *data ATTRIBUTE_UNUSED)
+{
+    if (virIsCapableFCHost(TEST_FC_HOST_PREFIX,
+                           TEST_FC_HOST_NUM))
+        return 0;
+
+    return -1;
+}
+
+/* Test virIsCapableVport */
+static int
+test2(const void *data ATTRIBUTE_UNUSED)
+{
+    if (virIsCapableVport(TEST_FC_HOST_PREFIX,
+                          TEST_FC_HOST_NUM))
+        return 0;
+
+    return -1;
+}
+
+/* Test virReadFCHost */
+static int
+test3(const void *data ATTRIBUTE_UNUSED)
+{
+    const char *expect_wwnn = "2001001b32a9da4e";
+    const char *expect_wwpn = "2101001b32a9da4e";
+    const char *expect_fabric_wwn = "2001000dec9877c1";
+    const char *expect_max_vports = "127";
+    const char *expect_vports = "0";
+    char *wwnn = NULL;
+    char *wwpn = NULL;
+    char *fabric_wwn = NULL;
+    char *max_vports = NULL;
+    char *vports = NULL;
+    int ret = -1;
+
+    if (virReadFCHost(TEST_FC_HOST_PREFIX,
+                      TEST_FC_HOST_NUM,
+                      "node_name",
+                      &wwnn) < 0)
+        return -1;
+
+    if (virReadFCHost(TEST_FC_HOST_PREFIX,
+                      TEST_FC_HOST_NUM,
+                      "port_name",
+                      &wwpn) < 0)
+        goto cleanup;
+
+    if (virReadFCHost(TEST_FC_HOST_PREFIX,
+                      TEST_FC_HOST_NUM,
+                      "fabric_name",
+                      &fabric_wwn) < 0)
+        goto cleanup;
+
+    if (virReadFCHost(TEST_FC_HOST_PREFIX,
+                      TEST_FC_HOST_NUM,
+                      "max_npiv_vports",
+                      &max_vports) < 0)
+        goto cleanup;
+
+
+    if (virReadFCHost(TEST_FC_HOST_PREFIX,
+                      TEST_FC_HOST_NUM,
+                      "npiv_vports_inuse",
+                      &vports) < 0)
+        goto cleanup;
+
+    if (STRNEQ(expect_wwnn, wwnn) ||
+        STRNEQ(expect_wwpn, wwpn) ||
+        STRNEQ(expect_fabric_wwn, fabric_wwn) ||
+        STRNEQ(expect_max_vports, max_vports) ||
+        STRNEQ(expect_vports, vports))
+        goto cleanup;
+
+    ret = 0;
+cleanup:
+    VIR_FREE(wwnn);
+    VIR_FREE(wwpn);
+    VIR_FREE(fabric_wwn);
+    VIR_FREE(max_vports);
+    VIR_FREE(vports);
+    return ret;
+}
+
+/* Test virGetFCHostNameByWWN */
+static int
+test4(const void *data ATTRIBUTE_UNUSED)
+{
+    const char *expect_hostname = "host5";
+    char *hostname = NULL;
+    int ret = -1;
+
+    if (!(hostname = virGetFCHostNameByWWN(TEST_FC_HOST_PREFIX,
+                                           "2001001b32a9da4e",
+                                           "2101001b32a9da4e")))
+        return -1;
+
+    if (STRNEQ(hostname, expect_hostname))
+        goto cleanup;
+
+    ret = 0;
+cleanup:
+    VIR_FREE(hostname);
+    return ret;
+}
+
+/* Test virFindFCHostCapableVport (host4 is not Online) */
+static int
+test5(const void *data ATTRIBUTE_UNUSED)
+{
+    const char *expect_hostname = "host5";
+    char *hostname = NULL;
+    int ret = -1;
+
+    if (!(hostname = virFindFCHostCapableVport(TEST_FC_HOST_PREFIX)))
+        return -1;
+
+    if (STRNEQ(hostname, expect_hostname))
+        goto cleanup;
+
+    ret = 0;
+cleanup:
+    VIR_FREE(hostname);
+    return ret;
+}
+
+static int
+mymain(void)
+{
+    int ret = 0;
+
+    if (virtTestRun("test1", 1, test1, NULL) < 0)
+        ret = -1;
+    if (virtTestRun("test2", 1, test2, NULL) < 0)
+        ret = -1;
+    if (virtTestRun("test3", 1, test3, NULL) < 0)
+        ret = -1;
+    if (virtTestRun("test4", 1, test4, NULL) < 0)
+        ret = -1;
+    if (virtTestRun("test5", 1, test5, NULL) < 0)
+        ret = -1;
+
+    return ret;
+}
+
+VIRT_TEST_MAIN(mymain)