diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am
index 30b610916..a4f7abfdb 100644
--- a/test/test-automation/Makefile.am
+++ b/test/test-automation/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I acinclude -I build-scripts
 
-SUBDIRS = testdummy testrect testplatform testaudio testsurface
+SUBDIRS = testdummy testrect testplatform testaudio testsurface testrwops
 runnerdir = .
 
 bin_PROGRAMS = runner
diff --git a/test/test-automation/build-scripts/install-tests.sh b/test/test-automation/build-scripts/install-tests.sh
index fb78a8e49..128d2bc9d 100755
--- a/test/test-automation/build-scripts/install-tests.sh
+++ b/test/test-automation/build-scripts/install-tests.sh
@@ -16,7 +16,7 @@ elif [[ $PLATFORM ==  "Darwin" ]]; then
 fi
 
 # TODO: put the test in an array
-for suite in "testdummy" "testplatform" "testrect" "testaudio" "testsurface"
+for suite in "testdummy" "testplatform" "testrect" "testaudio" "testsurface" "testrwops"
 do
 	cp -f "$suite/.libs/lib$suite.$EXT" $DIRECTORY
 done
diff --git a/test/test-automation/configure.ac b/test/test-automation/configure.ac
index 4b7468604..3688cb6dd 100644
--- a/test/test-automation/configure.ac
+++ b/test/test-automation/configure.ac
@@ -37,7 +37,8 @@ AC_CONFIG_FILES([Makefile
 				 testrect/Makefile
 				 testplatform/Makefile
 				 testaudio/Makefile
-				 testsurface/Makefile])
+				 testsurface/Makefile
+				 testrwops/Makefile])
 AC_OUTPUT
 
 echo ""
diff --git a/test/test-automation/fuzzer/fuzzer.c b/test/test-automation/fuzzer/fuzzer.c
index 01f4f59ea..53d171818 100644
--- a/test/test-automation/fuzzer/fuzzer.c
+++ b/test/test-automation/fuzzer/fuzzer.c
@@ -196,7 +196,7 @@ GenerateUnsignedBoundaryValues(const Uint64 maxValue,
 			tempBuf[index++] = boundary1 - 1;
 		}
 
-		if(boundary2 < maxValue) {
+		if(boundary2 < maxValue && boundary2 < UINT64_MAX) {
 			tempBuf[index++] = boundary2 + 1;
 		}
 	}
diff --git a/test/test-automation/testrwops/Makefile.am b/test/test-automation/testrwops/Makefile.am
new file mode 100644
index 000000000..8e3a2feb3
--- /dev/null
+++ b/test/test-automation/testrwops/Makefile.am
@@ -0,0 +1,4 @@
+lib_LTLIBRARIES = libtestrwops.la
+libtestrwops_la_SOURCES = testrwops.c
+libtestrwops_la_CLAGS = -fPIC -g
+libtestrwops_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la
diff --git a/test/test-automation/testrwops/testrwops.c b/test/test-automation/testrwops/testrwops.c
new file mode 100644
index 000000000..93ed992f7
--- /dev/null
+++ b/test/test-automation/testrwops/testrwops.c
@@ -0,0 +1,39 @@
+/**
+ * Original code: automated SDL platform test written by Edgar Simo "bobbens"
+ * Extended and updated by aschiffler at ferzkopp dot net
+ */
+
+#include <stdio.h>
+
+#include <SDL/SDL.h>
+
+#include "../SDL_test.h"
+
+
+
+/*!
+ * Note: Port tests from "/test/automated/rwops" here
+ *
+ */
+
+/* Test cases */
+static const TestCaseReference test1 =
+		(TestCaseReference){ "rwops_test", "rwopsy", TEST_ENABLED, 0, 0 };
+
+/* Test suite */
+extern const TestCaseReference *testSuite[] =  {
+	&test1, NULL
+};
+
+TestCaseReference **QueryTestSuite() {
+	return (TestCaseReference **)testSuite;
+}
+
+/**
+ * @brief Document test case here
+ */
+int
+rwops_test(void *arg)
+{
+	AssertPass("");
+}