4 files changed, 19 insertions, 7 deletions
diff --git a/t/03_object.t b/t/rest/populate_object.t
index 13de9d4..b875ad7 100644
--- a/t/03_object.t
+++ b/t/rest/populate_object.t
@@ -6,10 +6,10 @@ use JSON;
 use HTTP::Response;
 
 use Net::Riak::Bucket;
-use Net::Riak::Client;
+use Net::Riak;
 use Net::Riak::Object;
 
-my $client = Net::Riak::Client->new();
+my $client = Net::Riak->new()->client;
 my $bucket = Net::Riak::Bucket->new(name => 'foo', client => $client);
 
 ok my $object =
@@ -17,11 +17,12 @@ ok my $object =
   'object bar created';
 
 my $response = HTTP::Response->new(400);
+$client->http_response($response);
 
 ok !$object->exists, 'object don\'t exists';
 
 eval {
-    $object->populate($response, [200]);
+    $client->populate_object($object,  $response, [200]);
 };
 
 like $@, qr/Expected status 200, received 400/, "can't populate with a 400";
@@ -29,14 +30,15 @@ like $@, qr/Expected status 200, received 400/, "can't populate with a 400";
 my $value = {value => 1};
 
 $response = HTTP::Response->new(200);
+$client->http_response($response);
 $response->content(JSON::encode_json($value));
 
-$object->populate($response, [200]);
+$client->populate_object($object, $response, [200]);
 
 ok $object->exists, 'object exists';
 
 is_deeply $value, $object->data, 'got same data';
 
-is $object->status, 200, 'last http code is 200';
+is $object->client->status, 200, 'last http code is 200';
 
 done_testing;
diff --git a/t/07_properties.t b/t/rest/properties.t
index 26a643c..f6327ac 100644
--- a/t/07_properties.t
+++ b/t/rest/properties.t
@@ -5,7 +5,7 @@ use Test::More;
 use Net::Riak;
 use HTTP::Response;
 
-my $client = Net::Riak::Client->new;
+my $client = Net::Riak::Client->with_traits('Net::Riak::Transport::REST')->new();
 ok my $bucket = Net::Riak::Bucket->new(name => 'bar', client => $client),
   'client created';
 
diff --git a/t/rest/stats.t b/t/rest/stats.t
new file mode 100644
index 0000000..9f52dcc
--- /dev/null
+++ b/t/rest/stats.t
@@ -0,0 +1,10 @@
+use lib 't/lib';
+use Test::More;
+use Test::Riak;
+
+test_riak_rest {
+    my ($client) = @_;
+    my $resp = $client->stats;
+    is ref($resp), 'HASH', 'got stats';
+    ok exists $resp->{webmachine_version}, 'contains expected key';
+};
diff --git a/t/08_stream.t b/t/rest/stream.t
index becc600..2a545d3 100644
--- a/t/08_stream.t
+++ b/t/rest/stream.t
@@ -5,7 +5,7 @@ use Test::More;
 use Net::Riak;
 use HTTP::Response;
 
-my $client = Net::Riak::Client->new;
+my $client = Net::Riak::Client->with_traits('Net::Riak::Transport::REST')->new();
 ok my $bucket = Net::Riak::Bucket->new(name => 'bar', client => $client),
   'bucket created';