diff --git a/.travis.yml b/.travis.yml
index a3627fd..c77f38c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ cache:
 python:
   - "2.7"
   - "3.5"
+  - "3.7"
 install:
   - pip install tox-travis
   - sh get_testdata.sh
diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index fa35210..004f302 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -257,7 +257,7 @@ def read_VMP_modules(fileobj, read_module_data=True):
     while True:
         module_magic = fileobj.read(len(b'MODULE'))
         if len(module_magic) == 0:  # end of file
-            raise StopIteration
+            break
         elif module_magic != b'MODULE':
             raise ValueError("Found %r, expecting start of new VMP MODULE" % module_magic)
 
diff --git a/tox.ini b/tox.ini
index 09f70f4..bb55395 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35
+envlist = py27,py35,py37
 [testenv]
 deps=nose
 commands=nosetests