diff --git a/README.md b/README.md
index c367d40..52bd71b 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,13 @@ The criteria for inclusion is that the utility component be:
 * used by other Boost libraries, and
 * not dependent on any other Boost modules except Core itself, Config, Assert, Static Assert, or Predef.
 
+### CI Status
+
+Branch   | Travis | Appveyor
+---------|--------|---------
+Develop  | [![Build Status](https://travis-ci.org/boostorg/core.svg?branch=develop)](https://travis-ci.org/boostorg/core) | [![Build Status](https://ci.appveyor.com/api/projects/status/github/boostorg/core?branch=develop&svg=true)](https://ci.appveyor.com/project/pdimov/core)
+Master   | [![Build Status](https://travis-ci.org/boostorg/core.svg?branch=master)](https://travis-ci.org/boostorg/core) | [![Build Status](https://ci.appveyor.com/api/projects/status/github/boostorg/core?branch=master&svg=true)](https://ci.appveyor.com/project/pdimov/core)
+
 ### Directories
 
 * **doc** - Documentation of the components
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..d9d2ca5
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,35 @@
+# Copyright 2016 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+version: 1.0.{build}-{branch}
+
+shallow_clone: true
+
+branches:
+  only:
+    - master
+    - develop
+
+install:
+  - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost
+  - cd boost
+  - git submodule init libs/assert
+  - git submodule init libs/config
+  - git submodule init libs/core
+  - git submodule init libs/predef
+  - git submodule init libs/static_assert
+  - git submodule init libs/type_traits
+  - git submodule init tools/build
+  - git submodule init tools/inspect
+  - git submodule update
+  - cd libs\core
+  - git checkout -q %APPVEYOR_REPO_COMMIT%
+  - cd ..\..
+  - bootstrap
+  - b2 headers
+
+build: off
+
+test_script:
+  - b2 libs/core/test toolset=msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
diff --git a/test/eif_namespace_disambiguation.cpp b/test/eif_namespace_disambiguation.cpp
index 2a090cc..d190ee2 100644
--- a/test/eif_namespace_disambiguation.cpp
+++ b/test/eif_namespace_disambiguation.cpp
@@ -10,16 +10,19 @@
 //             Jeremiah Willcock (jewillco at osl.iu.edu)
 //             Andrew Lumsdaine (lums at osl.iu.edu)
 
-#include <boost/mpl/not.hpp>
-
+#include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
 using boost::enable_if;
-using boost::mpl::not_;
 using boost::is_arithmetic;
 
+template<class T> struct not_
+{
+  BOOST_STATIC_CONSTANT( bool, value = !T::value );
+};
+
 namespace A {
   template<class T>
   typename enable_if<is_arithmetic<T>, bool>::type
diff --git a/test/eif_no_disambiguation.cpp b/test/eif_no_disambiguation.cpp
index d2ecbd9..385451b 100644
--- a/test/eif_no_disambiguation.cpp
+++ b/test/eif_no_disambiguation.cpp
@@ -10,16 +10,19 @@
 //             Jeremiah Willcock (jewillco at osl.iu.edu)
 //             Andrew Lumsdaine (lums at osl.iu.edu)
 
-#include <boost/mpl/not.hpp>
-
+#include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-using boost::mpl::not_;
 using boost::enable_if;
 using boost::is_arithmetic;
 
+template<class T> struct not_
+{
+  BOOST_STATIC_CONSTANT( bool, value = !T::value );
+};
+
 template<class T>
 typename enable_if<is_arithmetic<T>, bool>::type
 arithmetic_object(T t) { return true; }