diff --git a/.circleci/config.yml b/.circleci/config.yml
index 15111c5..878845e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,6 +21,9 @@ workflows:
                 - master
                 - main
     jobs:
-      - dwave/test-linux
-      - dwave/test-osx
-      - dwave/test-win
+      - dwave/test-linux:
+          integration-tests: "canary"
+      - dwave/test-osx:
+          integration-tests: "skip"
+      - dwave/test-win:
+          integration-tests: "skip"
diff --git a/demo.py b/demo.py
index 31dae26..3a1a693 100644
--- a/demo.py
+++ b/demo.py
@@ -67,7 +67,7 @@ def set_up_scenario(w, h, num_poi, num_cs):
     """ Build scenario set up with specified parameters. """
 
     G = nx.grid_2d_graph(w, h)
-    nodes = G.nodes()
+    nodes = list(G.nodes)
 
     # Identify a fixed set of points of interest
     pois = random.sample(nodes, k=num_poi)
@@ -76,7 +76,7 @@ def set_up_scenario(w, h, num_poi, num_cs):
     charging_stations = random.sample(nodes, k=num_cs)
 
     # Identify potential new charging locations
-    potential_new_cs_nodes = list(nodes - charging_stations)
+    potential_new_cs_nodes = list(G.nodes() - charging_stations)
 
     return G, pois, charging_stations, potential_new_cs_nodes
 
diff --git a/tests/test_integration.py b/tests/test_integration.py
index cb71ecb..a017e15 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -17,20 +17,23 @@
 import sys
 import unittest
 import random
-import demo
+
 import neal
 import numpy as np
 
-project_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+import demo
 
-class TestDemo(unittest.TestCase):
+project_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+class TestSmoke(unittest.TestCase):
+    @unittest.skipIf(os.getenv('SKIP_INT_TESTS'), "Skipping integration test.")
     def test_smoke(self):
-        """run demo.py and check that nothing crashes"""
+        """Run demo.py and check that nothing crashes"""
 
         demo_file = os.path.join(project_dir, 'demo.py')
         subprocess.check_output([sys.executable, demo_file])
 
+class TestDemo(unittest.TestCase):
     def test_scenario_setup(self):
 
         w, h = random.randint(10,20), random.randint(10,20)