diff --git a/tmc-langs-r/getAvailablePoints.sh b/tmc-langs-r/getAvailablePoints.sh
deleted file mode 100644
index d3b12b5f7..000000000
--- a/tmc-langs-r/getAvailablePoints.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#Currently this script needs to be run at project root!
-
-Rscript -e "library(tmcRtestrunner);get_available_points(\"$PWD\")"
diff --git a/tmc-langs-r/runTests.sh b/tmc-langs-r/runTests.sh
deleted file mode 100755
index 039eb79fd..000000000
--- a/tmc-langs-r/runTests.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-#Currently this script needs to be run at project root!
-/usr/bin/Rscript -e "library(tmcRtestrunner);run_tests()"
diff --git a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java b/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java
index f34d5ac88..22a01bdc5 100644
--- a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java
+++ b/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java
@@ -144,32 +144,25 @@ public ValidationResult checkCodeStyle(Path path, Locale messageLocale) {
     }
 
     public String[] getTestCommand() {
-        
-        String[] rscr;
-        String[] command;
+        String[] command = new String[] {"Rscript"};
+        String[] args;
         if (SystemUtils.IS_OS_WINDOWS) {
-            rscr = new String[] {"Rscript", "-e"};
-            command = new String[] {"\"library('tmcRtestrunner');run_tests_with_default(TRUE)\""};
+            args = new String[] {"-e", "\"library('tmcRtestrunner');run_tests()\""};
         } else {
-            rscr = new String[] {"bash"};
-            command = new String[] {Paths.get("").toAbsolutePath().toString() + "/runTests.sh"};
+            args = new String[] {"-e", "library(tmcRtestrunner);run_tests()"};
         }
-        return ArrayUtils.addAll(rscr, command);
+        return ArrayUtils.addAll(command, args);
     }
     
     public String[] getAvailablePointsCommand() {
-        String[] rscr;
-        String[] command;
+        String[] command = new String[] {"Rscript"};
+        String[] args;
         if (SystemUtils.IS_OS_WINDOWS) {
-            rscr = new String[] {"Rscript", "-e"};
-            command = new String[] {"\"library(tmcRtestrunner);"
-                                    + "run_available_points(\"$PWD\")\""};
+            args = new String[] {"-e", "\"library('tmcRtestrunner');run_available_points()\""};
         } else {
-            rscr = new String[] {"bash"};
-            command = new String[] {Paths.get("").toAbsolutePath().toString() 
-                    + "/getAvailablePoints.sh"};
+            args = new String[] {"-e", "library(tmcRtestrunner);run_available_points()"};
         }
-        return ArrayUtils.addAll(rscr, command);
+        return ArrayUtils.addAll(command, args);
     }
     
     @Override
diff --git a/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java b/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java
index 71d91d84f..52bad761b 100644
--- a/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java
+++ b/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java
@@ -7,6 +7,7 @@
 import fi.helsinki.cs.tmc.langs.io.StudentFilePolicy;
 import fi.helsinki.cs.tmc.langs.utils.TestUtils;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.After;
 import org.junit.Assert;
@@ -38,32 +39,29 @@ public void tearDown() {
 
     @Test
     public void testGetTestCommand() {
+        String[] command = new String[] {"Rscript"};
+        String[] args;
+
         if (SystemUtils.IS_OS_WINDOWS) {
-            String[] expectedCommand = new String[]{"Rscript", "-e",
-                    "\"library('tmcRtestrunner');run_tests_with_default(TRUE)\""};
-            
-            Assert.assertArrayEquals(expectedCommand,plugin.getTestCommand());
-        } else if (SystemUtils.IS_OS_LINUX) {
-            String[] expectedCommand = new String[]{"bash",
-                Paths.get("").toAbsolutePath().toString() + "/runTests.sh"};
-            
-            Assert.assertArrayEquals(expectedCommand,plugin.getTestCommand());
+            args = new String[] {"-e", "\"library('tmcRtestrunner');run_tests()\""};
+        } else {
+            args = new String[] {"-e", "library(tmcRtestrunner);run_tests()"};
         }
+        String[] expectedCommand = ArrayUtils.addAll(command, args);
+        Assert.assertArrayEquals(expectedCommand,plugin.getTestCommand());
     }
     
     @Test
     public void testGetAvailablePointsCommand() {
+        String[] command = new String[] {"Rscript"};
+        String[] args;
         if (SystemUtils.IS_OS_WINDOWS) {
-            String[] expectedCommand = new String[]{"Rscript", "-e","\"library('tmcRtestrunner');"
-                    + "get_available_points(\"$PWD\")\""};
-            
-            Assert.assertArrayEquals(expectedCommand,plugin.getAvailablePointsCommand());
-        } else if (SystemUtils.IS_OS_LINUX) {
-            String[] expectedCommand = new String[]{"bash",
-                Paths.get("").toAbsolutePath().toString() + "/getAvailablePoints.sh"};
-            
-            Assert.assertArrayEquals(expectedCommand,plugin.getAvailablePointsCommand());
+            args = new String[] {"-e", "\"library('tmcRtestrunner');run_available_points()\""};
+        } else {
+            args = new String[] {"-e", "library(tmcRtestrunner);run_available_points()"};
         }
+        String[] expectedCommand = ArrayUtils.addAll(command, args);
+        Assert.assertArrayEquals(expectedCommand, plugin.getAvailablePointsCommand());
     }
     
     @Test