diff --git a/tests/unit-tests/test-state.cpp b/tests/unit-tests/test-state.cpp
index 9e7ce58..850f8da 100644
--- a/tests/unit-tests/test-state.cpp
+++ b/tests/unit-tests/test-state.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2017 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -19,13 +19,11 @@
 
 #include "state.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace chronosync {
 namespace test {
 
-using std::tuple;
-
 BOOST_AUTO_TEST_SUITE(StateTests)
 
 BOOST_AUTO_TEST_CASE(Basic)
@@ -42,7 +40,7 @@
   BOOST_CHECK_NO_THROW(state.reset());
   BOOST_CHECK_EQUAL(state.getLeaves().size(), 0);
 
-  tuple<bool, bool, SeqNo> result;
+  std::tuple<bool, bool, SeqNo> result;
   result = state.update(info, 12);
   BOOST_CHECK_EQUAL(std::get<0>(result), true);
   BOOST_CHECK_EQUAL(std::get<1>(result), false);