diff --git a/metadata/test_common.star b/metadata/test_common.star
index 99f8935..3694ada 100644
--- a/metadata/test_common.star
+++ b/metadata/test_common.star
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-load("@proto//chromiumos/config/api/test/tnull/v1/tnull.proto",
+load("@proto//chromiumos/config/api/test/harness/tnull/v1/tnull.proto",
     tnull_pb = "chromiumos.config.api.test.tnull.v1"
 )
 
diff --git a/src/tnull/driver/driver.go b/src/tnull/driver/driver.go
index a044bde..d7db6cf 100644
--- a/src/tnull/driver/driver.go
+++ b/src/tnull/driver/driver.go
@@ -9,9 +9,9 @@
 	"os"
 	"sync"
 
+	tnProto "go.chromium.org/chromiumos/config/go/api/test/harness/tnull/v1"
 	metadata "go.chromium.org/chromiumos/config/go/api/test/metadata/v1"
 	rtd "go.chromium.org/chromiumos/config/go/api/test/rtd/v1"
-	tnProto "go.chromium.org/chromiumos/config/go/api/test/tnull/v1"
 
 	"go.chromium.org/luci/common/errors"
 	"go.chromium.org/luci/common/sync/parallel"
diff --git a/src/tnull/main.go b/src/tnull/main.go
index 4e48464..0a301fe 100644
--- a/src/tnull/main.go
+++ b/src/tnull/main.go
@@ -4,8 +4,10 @@
 
 package main
 
-import "tnull/driver"
-import tnProto "go.chromium.org/chromiumos/config/go/api/test/tnull/v1"
+import (
+	"./driver" // TODO(crbug.com/1100435) Replace this with the right way
+	tnProto "go.chromium.org/chromiumos/config/go/api/test/harness/tnull/v1"
+)
 
 // Main does something eventually.
 func main() {
diff --git a/test/artifact.star b/test/artifact.star
index 52b9229..65b7fd5 100644
--- a/test/artifact.star
+++ b/test/artifact.star
@@ -4,7 +4,7 @@
 
 load("//metadata/test_common.star", "test_common")
 
-load("@proto//chromiumos/config/api/test/tnull/v1/tnull.proto",
+load("@proto//chromiumos/config/api/test/harness/tnull/v1/tnull.proto",
     tnull_pb = "chromiumos.config.api.test.tnull.v1"
 )
 
diff --git a/test/log.star b/test/log.star
index a3ca958..106f1b9 100644
--- a/test/log.star
+++ b/test/log.star
@@ -4,7 +4,7 @@
 
 load("//metadata/test_common.star", "test_common")
 
-load("@proto//chromiumos/config/api/test/tnull/v1/tnull.proto",
+load("@proto//chromiumos/config/api/test/harness/tnull/v1/tnull.proto",
     tnull_pb = "chromiumos.config.api.test.tnull.v1"
 )