diff --git a/Make.inc b/Make.inc
index 504a85d..f015fd8 100644
--- a/Make.inc
+++ b/Make.inc
@@ -1,7 +1,7 @@
 CC=gcc
 OS = $(shell uname)
 ARCH = $(shell uname -m)
-CFLAGS= -std=gnu99 -Wall -O2 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration
+CFLAGS= -std=c99 -Wall -O2 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration
 
 default: all
 
diff --git a/test/Makefile b/test/Makefile
index 9c96a9f..f741135 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,7 @@
 OPENLIBM_HOME=$(abspath ..)
 include ../Make.inc
 
-all: test-double test-float test-double-system test-float-system
+all: test-double test-float test-double-system
 
 test-double: test-double.c libm-test.c
 	$(CC) -g $< -D__BSD_VISIBLE -I ../include -I../src ../libopenlibm.a -o $@
diff --git a/test/libm-test.c b/test/libm-test.c
index 7da080f..74f2665 100644
--- a/test/libm-test.c
+++ b/test/libm-test.c
@@ -4538,9 +4538,7 @@ main (int argc, char **argv)
   /* Nearest integer functions:  */
   ceil_test ();
   floor_test ();
-  /*
-  nearbyint_test ();
-  */
+  //nearbyint_test ();
   rint_test ();
   lrint_test ();
   llrint_test ();