diff --git a/requirements.txt b/requirements.txt
index 0d9d0127996..8d5041c38ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -37,3 +37,7 @@ oslo.service>=0.1.0 # Apache-2.0
 oslo.utils>=1.6.0 # Apache-2.0
 
 python-novaclient>=2.22.0
+
+# Windows-only requirements
+pywin32;sys_platform=='win32'
+wmi;sys_platform=='win32'
diff --git a/setup.py b/setup.py
index 09b206ed561..056c16c2b8f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,9 +26,4 @@ except ImportError:
 
 setuptools.setup(
     setup_requires=['pbr'],
-    pbr=True,
-    # TODO(lifeless): Once pbr supports markers in requirements.txt, move this
-    # there, so that update.py can see it.
-    extras_require={
-        ':sys_platform=="win32"': ['pywin32', 'wmi']
-    })
+    pbr=True)