diff --git a/tests/README.md b/tests/README.md
index 0b7471123b..e4bda25494 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,6 +1,9 @@
 # Pytorch-Lightning Tests
 
 ## Running tests
+The automatic travis tests ONLY run CPU-based tests. Although these cover most of the use cases,
+run on a 2-GPU machine to validate the full test-suite.
+
 
 To run all tests do the following:
 ```bash
diff --git a/tests/test_models.py b/tests/test_models.py
index fcbcbce635..482fcae750 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -163,7 +163,7 @@ def test_cpu_model_with_amp():
 
     model, hparams = get_model()
 
-    with pytest.raises(ModuleNotFoundError):
+    with pytest.raises((MisconfigurationException, ModuleNotFoundError)):
         run_gpu_model_test(trainer_options, model, hparams, on_gpu=False)