diff --git a/.travis.yml b/.travis.yml
index 80e6603..3aed011 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: cpp
 install:
   - sudo apt-get install g++ cmake gfortran
   - sudo pip install pytest pep8
+before_script:
+  - export PYTHONPATH=$PYTHONPATH:$(pwd)
 script:
   - pep8 --ignore=E501 update.py
   - pep8 --ignore=E501 test/test.py
diff --git a/doc/new-project.rst b/doc/new-project.rst
index 143130d..1843994 100644
--- a/doc/new-project.rst
+++ b/doc/new-project.rst
@@ -8,7 +8,8 @@ Bootstrapping Autocmake
 -----------------------
 
 Download the ``update.py`` and execute it to fetch other infrastructure files
-which will be needed to build the project::
+which will be needed to build the project (on Windows ``wget`` is probably
+not available - in this case use an alternative)::
 
   mkdir cmake  # does not have to be called "cmake" - take the name you prefer
   cd cmake
diff --git a/test/test.py b/test/test.py
index 48eed90..40f3b8b 100644
--- a/test/test.py
+++ b/test/test.py
@@ -1,5 +1,6 @@
 import os
 import subprocess
+import update
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 
@@ -13,7 +14,7 @@ def exe(command):
 
 def test_cxx():
     os.chdir(os.path.join(HERE, 'cxx', 'cmake'))
-    stdout, stderr = exe('wget https://github.com/scisoft/autocmake/raw/master/update.py')
+    update.fetch_url('https://github.com/scisoft/autocmake/raw/master/update.py', 'update.py')
     stdout, stderr = exe('python update.py --self')
     stdout, stderr = exe('python update.py ..')
     os.chdir(os.path.join(HERE, 'cxx'))
@@ -26,7 +27,7 @@ def test_cxx():
 
 def test_fc():
     os.chdir(os.path.join(HERE, 'fc', 'cmake'))
-    stdout, stderr = exe('wget https://github.com/scisoft/autocmake/raw/master/update.py')
+    update.fetch_url('https://github.com/scisoft/autocmake/raw/master/update.py', 'update.py')
     stdout, stderr = exe('python update.py --self')
     stdout, stderr = exe('python update.py ..')
     os.chdir(os.path.join(HERE, 'fc'))