diff --git a/src/webhook_server.erl b/src/webhook_server.erl
new file mode 100644
index 000000000..5c2e86ec3
--- /dev/null
+++ b/src/webhook_server.erl
@@ -0,0 +1,97 @@
+%% -------------------------------------------------------------------
+%%
+%% Copyright (c) 2017 Basho Technologies, Inc.
+%%
+%% This file is provided to you under the Apache License,
+%% Version 2.0 (the "License"); you may not use this file
+%% except in compliance with the License.  You may obtain
+%% a copy of the License at
+%%
+%%   http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing,
+%% software distributed under the License is distributed on an
+%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+%% KIND, either express or implied.  See the License for the
+%% specific language governing permissions and limitations
+%% under the License.
+%%
+%% -------------------------------------------------------------------
+-module(webhook_server).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/1, get_next/0]).
+
+%% gen_server callbacks
+-export([
+    init/1,
+    handle_call/3,
+    handle_cast/2,
+    handle_info/2,
+    terminate/2,
+    code_change/3
+]).
+
+%% mochiweb callbacks
+-export([receive_callback/1]).
+
+-define(SERVER, ?MODULE).
+
+-record(state, {
+    receipts = queue:new()
+}).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+start_link(WebhookPort) ->
+    {ok, _Pid} = gen_server:start_link({local, ?SERVER}, ?MODULE, [WebhookPort], []),
+    ok.
+
+get_next() ->
+    gen_server:call(?MODULE, get_next).
+
+receive_callback(Req) ->
+    %% Beware, recv_body will fail if we call it outside this request
+    %% handler process, because mochiweb secretly stores stuff
+    %% in the process dictionary. The failure is also silent and
+    %% mysterious, due to mochiweb_request calling `exit(normal)`
+    %% in several places instead of crashing or properly handling
+    %% the error... o_O
+    Body = Req:recv_body(),
+    Req:respond({200, [], []}),
+    lager:info("Received call to webhook."),
+    gen_server:cast(?MODULE, {got_http_req, Req, Body}).
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+init([WebhookPort]) ->
+    {ok, _Pid} = mochiweb_http:start_link([{name, webhook_server_internal}, {loop, fun receive_callback/1}, {port, WebhookPort}]),
+    {ok, #state{}}.
+
+handle_call(get_next, _From, #state{receipts=Receipts} = State) ->
+    case queue:out(Receipts) of
+        {{value, Receipt}, Receipts2} ->
+            {reply, Receipt, State#state{receipts=Receipts2}};
+        {empty, Receipts} ->
+            {reply, empty, State}
+    end.
+
+handle_cast({got_http_req, _Req, _Body} = Receipt, #state{receipts=Receipts} = State) ->
+    {noreply, State#state{receipts = queue:in(Receipt, Receipts)}}.
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    mochiweb_http:stop(webhook_server_internal),
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
diff --git a/tests/s3_lifecycle_hooks.erl b/tests/s3_lifecycle_hooks.erl
new file mode 100644
index 000000000..fc9a5b121
--- /dev/null
+++ b/tests/s3_lifecycle_hooks.erl
@@ -0,0 +1,123 @@
+%% -------------------------------------------------------------------
+%%
+%% Copyright (c) 2017 Basho Technologies, Inc.
+%%
+%% This file is provided to you under the Apache License,
+%% Version 2.0 (the "License"); you may not use this file
+%% except in compliance with the License.  You may obtain
+%% a copy of the License at
+%%
+%%   http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing,
+%% software distributed under the License is distributed on an
+%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+%% KIND, either express or implied.  See the License for the
+%% specific language governing permissions and limitations
+%% under the License.
+%%
+%% -------------------------------------------------------------------
+
+-module(s3_lifecycle_hooks).
+-include_lib("eunit/include/eunit.hrl").
+
+%%
+%% This test uses some standard Riak APIs to create what the S3 web facade
+%% would otherwise create via its REST APIs, specifically, a Riak
+%%
+
+-export([confirm/0]).
+
+-define(BUCKET_TYPE, <<"s3_lifecycle_hooks">>).
+-define(OBJECT_KEY, <<"lifecycle_test_key">>).
+-define(OBJECT_OWNER, <<"Nick Marino">>).
+
+-define(WEBHOOK_PATH, "/lifecycle_hook").
+-define(WEBHOOK_PORT, 8765).
+-define(WEBHOOK_URL, "http://localhost:" ++ integer_to_list(?WEBHOOK_PORT) ++ ?WEBHOOK_PATH).
+
+-define(CONFIG, [
+    {riak_core, [
+        {ring_creation_size, 8},
+        {handoff_concurrency, 10},
+        {vnode_management_timer, 1000}
+    ]},
+    {riak_kv, [
+        {sweep_tick, 1000}
+    ]},
+    {riak_s3_api, [
+        {lifecycle_hook_url, ?WEBHOOK_URL},
+        {lifecycle_sweep_interval, 1},
+        %% Make objects "expire" instantly, as soon as a sweep happens:
+        {debug_lifecycle_expiration_bypass, true}
+    ]}
+]).
+-define(NUM_NODES, 1).
+
+
+confirm() ->
+    %%
+    %% Start our webhook
+    %%
+    lager:info("Starting mock lifecycle webhook server..."),
+    ok = webhook_server:start_link(?WEBHOOK_PORT),
+    %%
+    %% Build the cluster
+    %%
+    Cluster = rt:build_cluster(?NUM_NODES, ?CONFIG),
+    Node = lists:nth(random:uniform(length((Cluster))), Cluster),
+    rt:wait_for_service(Node, [riak_kv]),
+    %%
+    %% Create a mock S3 "bucket" (aka Riak bucket type) with
+    %%
+    rt:create_and_activate_bucket_type(Node, ?BUCKET_TYPE, [{riak_s3_lifecycle, [{'standard_ia.days', 1}]}]),
+    rt:wait_until_bucket_type_visible(Cluster, ?BUCKET_TYPE),
+
+    Bucket = rpc:call(Node, riak_s3_bucket, to_riak_bucket, [?BUCKET_TYPE]),
+    lager:info("Bucket: ~p", [Bucket]),
+
+
+    %% Populate an S3 "object" TODO refactor as needed -- maybe lots of puts?
+    %%
+    lager:info("Writing an object to the S3 bucket..."),
+    %% We have to use the internal client here, since the standard clients won't
+    %% let us write arbitrary keys to the object metadata...
+    {ok, Client} = rpc:call(Node, riak, local_client, []),
+    Obj0 = riak_object:new(Bucket, ?OBJECT_KEY, <<"test_value">>),
+    MD0 = riak_object:get_update_metadata(Obj0),
+    MD = dict:store(<<"X-Riak-S3-Owner">>, ?OBJECT_OWNER, MD0),
+    Obj = riak_object:update_metadata(Obj0, MD),
+    _Ret = Client:put(Obj),
+
+    %% TODO Force a sweep of our object's partition, just to speed up the test a bit?
+
+    %%
+    %% confirm webhook has been called
+    %%
+    lager:info("Waiting for lifecycle webhook to be executed..."),
+    ?assertEqual(ok, rt:wait_until(fun check_for_webhook_request/0)),
+
+    pass.
+
+check_for_webhook_request() ->
+    case webhook_server:get_next() of
+        empty ->
+            lager:info("No entry received yet."),
+            false;
+        {got_http_req, Req, Body} ->
+            verify_webhook_request_parameters(Req),
+            verify_webhook_request_body(Body),
+            true
+    end.
+
+verify_webhook_request_parameters(Req) ->
+    ?assertEqual('PUT', Req:get(method)),
+    ?assertEqual(?WEBHOOK_PATH, Req:get(path)).
+
+verify_webhook_request_body(BodyBin) ->
+    {struct, Body} = mochijson2:decode(BodyBin),
+    ?assertEqual({<<"bucket_name">>, ?BUCKET_TYPE}, lists:keyfind(<<"bucket_name">>, 1, Body)),
+    ?assertEqual({<<"object_name">>, ?OBJECT_KEY}, lists:keyfind(<<"object_name">>, 1, Body)),
+    ?assertEqual({<<"object_owner_id">>, ?OBJECT_OWNER},
+                  lists:keyfind(<<"object_owner_id">>, 1, Body)),
+    true.