diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0ea73b2fe..7edf89395 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -99,6 +99,10 @@ set(testsupport_SOURCES modeltest.cpp FailDevice.cpp)
 add_library(testsupport STATIC ${testsupport_SOURCES})
 target_link_libraries(testsupport ${MHD_LIBRARIES} Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Test)
 
+if(YUBIKEY_FOUND)
+  set(TEST_LIBRARIES ${TEST_LIBRARIES} ${YUBIKEY_LIBRARIES})
+endif()
+
 add_unit_test(NAME testgroup SOURCES TestGroup.cpp
               LIBS ${TEST_LIBRARIES})
 
@@ -165,6 +169,10 @@ add_unit_test(NAME testexporter SOURCES TestExporter.cpp
 add_unit_test(NAME testcsvexporter SOURCES TestCsvExporter.cpp
               LIBS ${TEST_LIBRARIES})
 
+add_unit_test(NAME testykchallengeresponsekey
+              SOURCES TestYkChallengeResponseKey.cpp TestYkChallengeResponseKey.h
+              LIBS ${TEST_LIBRARIES})
+
 if(WITH_GUI_TESTS)
   add_subdirectory(gui)
 endif(WITH_GUI_TESTS)
diff --git a/tests/TestYkChallengeResponseKey.cpp b/tests/TestYkChallengeResponseKey.cpp
new file mode 100644
index 000000000..91fba83cb
--- /dev/null
+++ b/tests/TestYkChallengeResponseKey.cpp
@@ -0,0 +1,108 @@
+/*
+ *  Copyright (C) 2014 Kyle Manna <kyle@kylemanna.com>
+ *
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "TestYkChallengeResponseKey.h"
+
+#include <QTest>
+#include <QtConcurrentRun>
+
+#include "keys/YkChallengeResponseKey.h"
+
+QTEST_GUILESS_MAIN(TestYubiKeyChalResp)
+
+void TestYubiKeyChalResp::initTestCase()
+{
+    m_detected = 0;
+    m_key = NULL;
+}
+
+void TestYubiKeyChalResp::cleanupTestCase()
+{
+    if (m_key)
+        delete m_key;
+}
+
+void TestYubiKeyChalResp::init()
+{
+    bool result = YubiKey::instance()->init();
+
+    if (!result) {
+        QSKIP("Unable to connect to YubiKey", SkipAll);
+    }
+}
+
+void TestYubiKeyChalResp::detectDevices()
+{
+    connect(YubiKey::instance(), SIGNAL(detected(int,bool)),
+                                 SLOT(ykDetected(int,bool)),
+                                 Qt::QueuedConnection);
+    QtConcurrent::run(YubiKey::instance(), &YubiKey::detect);
+
+    /* Need to wait for the hardware (that's hopefully plugged in)... */
+    QTest::qWait(2000);
+    QVERIFY2(m_detected > 0, "Is a YubiKey attached?");
+}
+
+void TestYubiKeyChalResp::getSerial()
+{
+    unsigned int serial;
+    QVERIFY(YubiKey::instance()->getSerial(serial));
+}
+
+void TestYubiKeyChalResp::keyGetName()
+{
+    QVERIFY(m_key);
+    QVERIFY(m_key->getName().length() > 0);
+}
+
+void TestYubiKeyChalResp::keyIssueChallenge()
+{
+    QVERIFY(m_key);
+    if (m_key->isBlocking()) {
+        /* Testing active mode in unit tests is unreasonable */
+        QSKIP("YubiKey not in passive mode", SkipSingle);
+    }
+
+    QByteArray ba("UnitTest");
+    QVERIFY(m_key->challenge(ba));
+
+    /* TODO Determine if it's reasonable to provide a fixed secret key for
+     *      verification testing.  Obviously simple technically, but annoying
+     *      if devs need to re-program their yubikeys or have a spare test key
+     *      for unit tests to past.
+     *
+     *      Might be worth it for integrity verification though.
+     */
+}
+
+void TestYubiKeyChalResp::ykDetected(int slot, bool blocking)
+{
+    Q_UNUSED(blocking);
+
+    if (slot > 0)
+        m_detected++;
+
+    /* Key used for later testing */
+    if (!m_key)
+        m_key = new YkChallengeResponseKey(slot, blocking);
+}
+
+void TestYubiKeyChalResp::deinit()
+{
+    QVERIFY(YubiKey::instance()->deinit());
+}
diff --git a/tests/TestYkChallengeResponseKey.h b/tests/TestYkChallengeResponseKey.h
new file mode 100644
index 000000000..4699b9101
--- /dev/null
+++ b/tests/TestYkChallengeResponseKey.h
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (C) 2014 Kyle Manna <kyle@kylemanna.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_TESTYUBIKEYCHALRESP_H
+#define KEEPASSX_TESTYUBIKEYCHALRESP_H
+
+#include <QObject>
+
+#include "keys/YkChallengeResponseKey.h"
+
+class TestYubiKeyChalResp: public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanupTestCase();
+
+    void init();
+
+    /* Order is important!
+     * Need to init and detectDevices() before proceeding
+     */
+    void detectDevices();
+
+    void getSerial();
+    void keyGetName();
+    void keyIssueChallenge();
+
+    void deinit();
+
+    /* Callback for detectDevices() */
+    void ykDetected(int slot, bool blocking);
+
+private:
+    int m_detected;
+    YkChallengeResponseKey *m_key;
+};
+
+#endif // KEEPASSX_TESTYUBIKEYCHALRESP_H