diff --git a/.gitignore b/.gitignore
index bebea7dd..5b27ad85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.o
 *.so
 *.swp
+*.trs
 .deps
 .libs
 .version
@@ -50,6 +51,7 @@ slabtop
 snice
 stamp-h1
 sysctl
+test-driver
 tload
 top/Makefile
 top/Makefile.in
diff --git a/Makefile.am b/Makefile.am
index e9c437a7..342a8e3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -230,7 +230,8 @@ noinst_PROGRAMS = \
 	lib/test_strutils \
 	lib/test_fileutils \
 	lib/test_nsutils \
-	lib/test_process
+	lib/test_process \
+	proc/test_sysinfo
 
 lib_test_strutils_SOURCES = lib/test_strutils.c lib/strutils.c
 lib_test_strutils_LDADD =
@@ -241,12 +242,16 @@ lib_test_nsutils_LDADD =
 lib_test_process_SOURCES = lib/test_process.c
 lib_test_process_LDADD =
 
+proc_test_sysinfo_SOURCES = proc/test_sysinfo.c
+proc_test_sysinfo_LDADD = proc/libprocps.la
 if EXAMPLE_FILES
 sysconf_DATA = sysctl.conf
 endif
 
 BUILT_SOURCES = $(top_srcdir)/.version
 
+TESTS = proc/test_sysinfo
+
 $(top_srcdir)/.version:
 	touch $(top_srcdir)/.version
 	echo $(VERSION) > $@-t && mv $@-t $@
diff --git a/proc/.gitignore b/proc/.gitignore
new file mode 100644
index 00000000..564a97d6
--- /dev/null
+++ b/proc/.gitignore
@@ -0,0 +1 @@
+test_sysinfo
diff --git a/proc/test_sysinfo.c b/proc/test_sysinfo.c
new file mode 100644
index 00000000..9597d50d
--- /dev/null
+++ b/proc/test_sysinfo.c
@@ -0,0 +1,77 @@
+/*
+ * libprocps - Library to read proc filesystem
+ * Tests for sysinfo library calls
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <proc/sysinfo.h>
+
+struct test_func {
+    int (*func)(void *data);
+    char *name;
+};
+
+int check_hertz(void *data)
+{
+    long hz;
+
+    hz =  procps_hertz_get();
+    return (hz > 0);
+}
+
+int check_loadavg(void *data)
+{
+    double a,b,c;
+
+    if (procps_loadavg(&a, &b, &c) == 0)
+        return 1;
+    return (a>0 && b>0 && c>0);
+}
+
+int check_loadavg_null(void *data)
+{
+    if (procps_loadavg(NULL, NULL, NULL) == 0)
+        return 1;
+    return 0;
+}
+
+struct test_func tests[] = {
+    { check_hertz, "procps_hertz_get()"},
+    { check_loadavg, "procps_loadavg()"},
+    { check_loadavg, "procps_loadavg() with NULLs"},
+    { NULL, NULL}
+};
+
+int main(int argc, char *argv[])
+{
+    int i;
+    struct test_func *current;
+
+    for(i=0; tests[i].func != NULL; i++) {
+        current = &tests[i];
+        if (!current->func(NULL)) {
+            fprintf(stderr, "FAIL: %s\n", current->name);
+            return EXIT_FAILURE;
+        } else {
+            fprintf(stderr, "PASS: %s\n", current->name);
+        }
+    }
+    return EXIT_SUCCESS;
+}
+
+