diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index 29568b1bc..825a71ead 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -203,7 +203,7 @@ build fbsql arm64:
   variables:
     BUILD_NAME: build_${CI_COMMIT_SHA}_${CI_CONCURRENT_ID}
   tags:
-    - shell-arm64
+    - shell
   rules:
     - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
   script:
diff --git a/cli/cli_kafka_integration_test.go b/cli/cli_kafka_integration_test.go
index 8ab857729..37197dd09 100644
--- a/cli/cli_kafka_integration_test.go
+++ b/cli/cli_kafka_integration_test.go
@@ -55,10 +55,10 @@ func getKafkaRunnerTestServices() *KafkaRunnerTestServices {
 // data to kafka, configure the runner, and test that the runner successfully
 // ran.
 type kafkaRunnerTest struct {
-	ConfigFile      string // path to the configuration file used for the runner
-	DataFile        string // path to the data file to populate kafka with
-	CreateTableStmt string // statement used to create table prior to ingest
-	SchemaFile      string
+	ConfigFile      string      // path to the configuration file used for the runner
+	DataFile        string      // path to the data file to populate kafka with
+	CreateTableStmt string      // statement used to create table prior to ingest
+	SchemaFile      string      // path to schema file for schema encoded messages (e.g. avro)
 	Tests           []testQuery // list of test which are 2-tuples of query and expected results
 
 }
@@ -175,9 +175,9 @@ var kafkaRunnerTests = []kafkaRunnerTest{
 //  5. Runs the cli.Command
 //  6. Confirms that the data was written to FeatureBase as expected
 func TestKafkaRunner(t *testing.T) {
-	//if testing.Short() {
-	//	t.Skip("skipping integration test")
-	//}
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
 
 	// Get host and port pair for services required for test (e.g. kafka and
 	// featurebase)