diff --git a/lib/funnel_cake_index/indexer_config.rb b/lib/funnel_cake_index/indexer_config.rb
index ed495a9..9051db7 100644
--- a/lib/funnel_cake_index/indexer_config.rb
+++ b/lib/funnel_cake_index/indexer_config.rb
@@ -37,9 +37,8 @@
   provide "nokogiri.strict_mode", "false"
 
   if ENV["SOLR_AUTH_USER"] && ENV["SOLR_AUTH_PASSWORD"]
-    client = HTTPClient.new
-    client.set_auth(solr_url, ENV["SOLR_AUTH_USER"], ENV["SOLR_AUTH_PASSWORD"])
-    provide "solr_json_writer.http_client", client
+    provide "solr_writer.basic_auth_user", ENV["SOLR_AUTH_USER"]
+    provide "solr_writer.basic_auth_password", ENV["SOLR_AUTH_PASSWORD"]
   end
 end
 
diff --git a/spec/indexer_config_spec.rb b/spec/indexer_config_spec.rb
new file mode 100644
index 0000000..5addece
--- /dev/null
+++ b/spec/indexer_config_spec.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+RSpec.describe "Traject configuration" do
+  indexer = Traject::Indexer::NokogiriIndexer.new
+  let(:settings) {
+    indexer.load_config_file("lib/funnel_cake_index/indexer_config.rb")
+    indexer.settings
+  }
+  let(:mapped_record) { indexer.map_record(record) }
+
+  context "neither SOLR_AUTH_USER, nor SOLR_AUTH_PASSWORD env variables are set" do
+    before do
+      ENV["SOLR_URL"] = "http://example.com:8090"
+    end
+
+    it "does not set solr_writer.basic_auth_user" do
+      expect(settings["solr_writer.basic_auth_user"]).to be_nil
+    end
+
+    it "does not set solr_writer.basic_auth_password" do
+      expect(settings["solr_writer.basic_auth_password"]).to be_nil
+    end
+  end
+
+  context "only SOLR_AUTH_USER env variable is set" do
+    before do
+      ENV["SOLR_AUTH_USER"] = "foo"
+    end
+
+    after do
+      ENV.delete("SOLR_AUTH_USER")
+    end
+
+    it "does not set solr_writer.basic_auth_user" do
+      expect(settings["solr_writer.basic_auth_user"]).to be_nil
+    end
+
+    it "does not set solr_writer.basic_auth_password" do
+      expect(settings["solr_writer.basic_auth_password"]).to be_nil
+    end
+  end
+
+  context "only SOLR_AUTH_PASSWORD env variable is set" do
+    before do
+      ENV["SOLR_AUTH_PASSWORD"] = "bar"
+    end
+
+    after do
+      ENV.delete("SOLR_AUTH_PASSWORD")
+    end
+
+    it "does not set solr_writer.basic_auth_user" do
+      expect(settings["solr_writer.basic_auth_user"]).to be_nil
+    end
+
+    it "does not set solr_writer.basic_auth_password" do
+      expect(settings["solr_writer.basic_auth_password"]).to be_nil
+    end
+  end
+
+  context "both SOLR_AUTH_USER, and  SOLR_AUTH_PASSWORD env variables are set" do
+    before do
+      ENV["SOLR_AUTH_USER"] = "foo"
+      ENV["SOLR_AUTH_PASSWORD"] = "bar"
+    end
+
+    after do
+      ENV.delete("SOLR_AUTH_USER")
+      ENV.delete("SOLR_AUTH_PASSWORD")
+    end
+
+    it "does not set solr_writer.basic_auth_user" do
+      expect(settings["solr_writer.basic_auth_user"]).to eq("foo")
+    end
+
+    it "does not set solr_writer.basic_auth_password" do
+      expect(settings["solr_writer.basic_auth_password"]).to eq("bar")
+    end
+  end
+end