diff --git a/.github/workflows/build_tests.yaml b/.github/workflows/build_tests.yaml
index 9f0307af7..017f8a1e3 100644
--- a/.github/workflows/build_tests.yaml
+++ b/.github/workflows/build_tests.yaml
@@ -153,7 +153,10 @@ jobs:
     - name: Authenticate Docker
       run: gcloud auth configure-docker --quiet
     - name: Create test script to execute in workloads
-      run: echo -e '#!/bin/bash \n echo "Hello world from a test script!"' > workload.sh
+      run: echo -e '#!/bin/bash \nsleep 3 \necho "Hello world from a test script!"' > workload.sh
+    - name: Run a job
+      run: |
+        python xpk.py run --cluster $TPU_CLUSTER_NAME --zone=us-central2-b workload.sh | awk '/Starting log streaming for pod xpk-def-app-profile-slurm-[a-zA-Z0-9]+-[0-9]+-[a-zA-Z0-9]+.../,/Job logs streaming finished./ { print }'
     - name: Run a base-docker-image workload
       run: python xpk.py workload create --cluster $TPU_CLUSTER_NAME --workload $WORKLOAD_NAME  --command "bash workload.sh"  --tpu-type=$TPU_TYPE --num-slices=2 --zone=us-central2-b
     - name: Run xpk inspector with the workload created above
diff --git a/Makefile b/Makefile
index c01e208e5..fd9b74ff0 100644
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,12 @@ install-kueuectl: mkdir-bin
 
 .PHONY: install-kjobctl
 install-kjobctl: mkdir-bin
-	curl -Lo $(BIN_PATH)/kubectl-kjob $(KJOBCTL_URL)
-	chmod +x $(BIN_PATH)/kubectl-kjob
+	# TODO: Upgrade kjob to the latest version to support the '--wait' flag.
+	docker build -f tools/Dockerfile-kjob -t $(KJOB_DOCKER_IMG) tools/
+	docker run -idt --name $(KJOB_DOCKER_CONTAINER) $(KJOB_DOCKER_IMG)
+	docker cp $(KJOB_DOCKER_CONTAINER):/kjob/bin/kubectl-kjob $(BIN_PATH)/kubectl-kjob
+	docker rm -f $(KJOB_DOCKER_CONTAINER)
+	docker image rm $(KJOB_DOCKER_IMG)
 
 .PHONY: check-gcloud
 check-gcloud: