diff --git a/gpu/libcecl/integration_test/integration_test.py b/gpu/libcecl/integration_test/integration_test.py
index ee58c7754..00cc0c967 100644
--- a/gpu/libcecl/integration_test/integration_test.py
+++ b/gpu/libcecl/integration_test/integration_test.py
@@ -126,7 +126,7 @@ def test_rewrite_compile_link_execute_clinfo(
   )
 
 
-@test.XFail(reason="Oclgrind environment is broken")
+@test.XFail(reason="FIXME(github.com/ChrisCummins/phd/issues/69)")
 def test_rewrite_compile_link_execute(tempdir: pathlib.Path, hello_src: str):
   """Test end-to-end libcecl pipeline."""
   log = _RewriteCompileLinkExecute(
diff --git a/research/cummins_2017_cgo/opencl_kernel_driver_test.py b/research/cummins_2017_cgo/opencl_kernel_driver_test.py
index d19b01442..827b28d21 100644
--- a/research/cummins_2017_cgo/opencl_kernel_driver_test.py
+++ b/research/cummins_2017_cgo/opencl_kernel_driver_test.py
@@ -35,6 +35,7 @@ def test_Drive_invalid_opencl_kernel(opencl_env: cldrive_env.OpenCLEnvironment):
     opencl_kernel_driver.Drive("Syntax error!", 16, 16, opencl_env, 5)
 
 
+@test.XFail(reason="FIXME(github.com/ChrisCummins/phd/issues/69)")
 def test_Drive_no_output(opencl_env: cldrive_env.OpenCLEnvironment):
   """Test that the correct number of logs are returned."""
   with test.Raises(opencl_kernel_driver.KernelProducesNoOutput):
@@ -50,6 +51,7 @@ def test_Drive_no_output(opencl_env: cldrive_env.OpenCLEnvironment):
     )
 
 
+@test.XFail(reason="FIXME(github.com/ChrisCummins/phd/issues/69)")
 def test_Drive_maybe_non_deterministic(
   opencl_env: cldrive_env.OpenCLEnvironment,
 ):
@@ -73,6 +75,7 @@ def test_Drive_maybe_non_deterministic(
     )
 
 
+@test.XFail(reason="FIXME(github.com/ChrisCummins/phd/issues/69)")
 def test_Drive_log_count(opencl_env: cldrive_env.OpenCLEnvironment):
   """Test that the correct number of logs are returned."""
   logs = opencl_kernel_driver.Drive(