diff --git a/src/kernel.c b/src/kernel.c
index 94cc7a2d4..de460755f 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -559,10 +559,11 @@ mrb_value mrb_print_m(mrb_state *mrb, mrb_value self);
 static mrb_value
 mrb_p_m(mrb_state *mrb, mrb_value self)
 {
- mrb_int argc;
+  mrb_int argc;
   mrb_value *argv;
 
   mrb_get_args(mrb, "*", &argv, &argc);
+  if (argc == 0) return mrb_nil_value();
   for (mrb_int i=0; i<argc; i++) {
     mrb_p(mrb, argv[i]);
   }
diff --git a/test/t/kernel.rb b/test/t/kernel.rb
index 315035939..35d510abf 100644
--- a/test/t/kernel.rb
+++ b/test/t/kernel.rb
@@ -15,7 +15,9 @@ end
 
 # Kernel.loop is not provided by mruby. '15.3.1.2.8'
 
-# Kernel.p is provided by the mruby-io mrbgem. '15.3.1.2.9'
+assert('Kernel.p', '15.3.1.2.9') do
+  assert_equal 1, Kernel.__send__(:p, 1)
+end
 
 # Kernel.print is provided by the mruby-io mrbgem. '15.3.1.2.10'
 
@@ -333,7 +335,11 @@ assert('Kernel#object_id', '15.3.1.3.33') do
   assert_kind_of Numeric, 1.0.object_id
 end
 
-# Kernel#p is defined in mruby-io mrbgem. '15.3.1.3.34'
+assert('Kernel#p', '15.3.1.3.34') do
+  assert_equal nil, p
+  assert_equal nil, p(p)
+  assert_equal [:a, :b], p(:a, :b)
+end
 
 # Kernel#print is defined in mruby-io mrbgem. '15.3.1.3.35'