diff --git a/include/libxml/xmlexports.h b/include/libxml/xmlexports.h
index ee03cad132..d4a1362f8c 100644
--- a/include/libxml/xmlexports.h
+++ b/include/libxml/xmlexports.h
@@ -110,7 +110,7 @@
 #endif
 
 /* Cygwin platform, GNU compiler */
-#if defined(_WIN32) && defined(__CYGWIN__)
+#if defined(__CYGWIN__)
   #undef XMLPUBFUN
   #undef XMLPUBVAR
   #undef XMLCALL
diff --git a/src/fingerprint.cpp b/src/fingerprint.cpp
index 4dc0e34796..564c528beb 100644
--- a/src/fingerprint.cpp
+++ b/src/fingerprint.cpp
@@ -30,7 +30,7 @@ GNU General Public License for more details.
 using namespace std;
 namespace OpenBabel
 {
-#if defined(__CYGWIN32__) || defined(__MINGW32__)
+#if defined(__CYGWIN__) || defined(__MINGW32__)
   // macro to implement static OBPlugin::PluginMapType& Map()
   PLUGIN_CPP_FILE(OBFingerprint)
 #endif
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 85f031b2f5..f588d21ec7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -235,6 +235,7 @@ endif(NOT MINGW AND NOT CYGWIN)
 ###############################
 
 if (PYTHON_BINDINGS)
+  include(UsePythonTest)
   set(pybindtests
       bindings _pybel example)
   foreach(pybindtest ${pybindtests})