diff --git a/client/client_test.go b/client/client_test.go
index 64a6741..db89915 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -2373,6 +2373,12 @@ func testPresaving(t *testing.T, tester shellTester, shellName string) {
 }
 
 func testTabCompletion(t *testing.T, tester shellTester, shellName string) {
+	if shellName == "bash" {
+		// TODO: Enable tab completions for bash by adding the below line to config.sh
+		//   type _get_comp_words_by_ref &>/dev/null && source <(hishtory completion bash)
+		t.Skip()
+	}
+
 	// Setup
 	defer testutils.BackupAndRestore(t)()
 	installHishtory(t, tester, "")
diff --git a/client/lib/config.sh b/client/lib/config.sh
index 6b639b6..289f9eb 100644
--- a/client/lib/config.sh
+++ b/client/lib/config.sh
@@ -51,5 +51,3 @@ __hishtory_bind_control_r() {
 }
 
 [ "$(hishtory config-get enable-control-r)" = true ] && __hishtory_bind_control_r
-
-source <(hishtory completion bash)
\ No newline at end of file