diff --git a/priv/riak_shell/riak_shell_regression1.log b/priv/riak_shell/riak_shell_regression1.log
index 9c00e949..a7e8c553 100644
--- a/priv/riak_shell/riak_shell_regression1.log
+++ b/priv/riak_shell/riak_shell_regression1.log
@@ -48,20 +48,20 @@ GeoCheckin
 {{command, "select * from GeoCheckin where myfamily = 'family1' and myseries = 'series1' and time >= 1 and time <= 2;\n"},
  {result,
 "myfamily,myseries,time,weather,temperature
-family1,series1,1970-01-01T00:00:00.001Z,snow,2.51999999999999992895e+01
-family1,series1,1970-01-01T00:00:00.002Z,rain,2.45000000000000000000e+01
+family1,series1,1970-01-01T00:00:00.001Z,snow,25.2
+family1,series1,1970-01-01T00:00:00.002Z,rain,24.5
 "}}.
 {{command, "select * from GeoCheckin where myfamily = 'family1' and myseries = 'series1' and time >= 10 and time <= 8;\n"}, {result, "Error (1001): The lower time bound is greater than the upper time bound."}}.
 {{command, "select * from GeoCheckin where myfamily = 'family1' and myseries = 'series1' and time >= 10;\n"}, {result, "Error (1001): Where clause has no upper bound."}}.
 {{command, "select * from GeoCheckin where myfamily = 'family1' and myseries = 'series1' and time <= 8;\n"}, {result, "Error (1001): Where clause has no lower bound."}}.
 {{command, "select * from GeoCheckin where myfamily = 'family1' and myseries = 'series1' and time >= 2 and time <= 7;\n"}, {result,
 "myfamily,myseries,time,weather,temperature
-family1,series1,1970-01-01T00:00:00.002Z,rain,2.45000000000000000000e+01
-family1,series1,1970-01-01T00:00:00.003Z,rain,2.30000000000000000000e+01
-family1,series1,1970-01-01T00:00:00.004Z,sunny,2.86000000000000014211e+01
-family1,series1,1970-01-01T00:00:00.005Z,sunny,2.46999999999999992895e+01
-family1,series1,1970-01-01T00:00:00.006Z,cloudy,3.27890000000000014779e+01
-family1,series1,1970-01-01T00:00:00.007Z,cloudy,2.78999999999999985789e+01
+family1,series1,1970-01-01T00:00:00.002Z,rain,24.5
+family1,series1,1970-01-01T00:00:00.003Z,rain,23.0
+family1,series1,1970-01-01T00:00:00.004Z,sunny,28.6
+family1,series1,1970-01-01T00:00:00.005Z,sunny,24.7
+family1,series1,1970-01-01T00:00:00.006Z,cloudy,32.789
+family1,series1,1970-01-01T00:00:00.007Z,cloudy,27.9
 "}}.
 {{command, "show_cookie; "}, {result, "Cookie is riak [actual riak]"}}.
 {{command, "show_config; "}, {result, "The config is [{cookie,riak},
@@ -77,6 +77,6 @@ family1,series1,1970-01-01T00:00:00.007Z,cloudy,2.78999999999999985789e+01
 {{command, "INSERT INTO GeoCheckin2 (region, state, time, weather, temperature) VALUES ('South Atlantic', 'South Carolina', 1452252523183, 'raining', 11.2);\n"}, {result, ""}}.
 {{command, "INSERT INTO GeoCheckin2 (region, state, time, weather, temperature) VALUES ('South Atlantic', 'South Carolina', 1452252523189, 'snowing', 19.2);\n"}, {result, ""}}.
 {{command, "SELECT 555, 1.1, 1e1, 1.123e-2 from GeoCheckin2 WHERE time > 1452252523182 AND time < 1452252543182 AND region = 'South Atlantic' AND state = 'South Carolina';\n"}, {result, "555,1.1,10.0,0.01123
-555,1.10000000000000008882e+00,1.00000000000000000000e+01,1.12300000000000003986e-02
-555,1.10000000000000008882e+00,1.00000000000000000000e+01,1.12300000000000003986e-02
+555,1.1,10.0,0.01123
+555,1.1,10.0,0.01123
 "}}.
diff --git a/tests/ts_cluster_riak_shell_basic_sql.erl b/tests/ts_cluster_riak_shell_basic_sql.erl
index f2cc2464..09ae7ef7 100644
--- a/tests/ts_cluster_riak_shell_basic_sql.erl
+++ b/tests/ts_cluster_riak_shell_basic_sql.erl
@@ -134,5 +134,5 @@ to_list(B) when is_binary(B)  -> binary_to_list(B);
 %% We can cheat here: the only integer in the DDL is a timestamp, so
 %% any integer we see we can convert to ISO 8601.
 to_list(I) when is_integer(I) -> jam_iso8601:to_string(jam:from_epoch(I, 3));
-to_list(F) when is_float(F)   -> float_to_list(F);
+to_list(F) when is_float(F)   -> mochinum:digits(F);
 to_list(L) when is_list(L)    -> L.